Hello,
Here is a patch (untested) to describe an idea I just had.
At the moment you can do "make-live -t iso"
then rm debian-live/.stage/image_binary" and do "make-live -t net"
and both created images work... both built from same chroot.
However if you then do rm debian-live/.stage/image_binary" and do
"make-live -t iso" the new iso image created will have two differences
to the first iso produced:
(1) the image will not boot as /etc/initramfs-tools/initramfs.conf
is configured with MODULES=netboot
(2) the new iso rootfs has smbfs installed
My proposed solution is to:
(1) rewrite /etc/initramfs-tools/initramfs.conf and rebuild the
initramfs for all 3 types (usb,iso,net) and not just net, this should
make things bootable!
[Ideally we could augment the initramfs so it has all modules and does
not need to be rebuilt for net. Yes this would make it larger but
being able to copy the initramfs of cd and use it to netboot would be
nice!]
(2) don't special case the install of smbfs but ad it to the minimal
lists. This keeps the default for net, and adds a small overhead for
cdrom/usb. BUT it makes all type behave the same and means that by
using a custom file list you can remove smbfs if you are cdrom/usb
booting and if you are NFS netbooting (obviously you need to keep it
for SMBFS net boot!).
Also why was the netboot stuff in a "if [ "${LIVE_ARCHITECTURE}" =
"amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]" clause? Netboot
seems arch indep to me?
Patch is attached.
Sorry I have not tested it :-(
Probably need to check the initramfs.conf config as I have cut it
right back to what I think is minimal... I may have been over zealous
Bye for now
Alex Owen
Index: helpers/lh_buildbinary
===================================================================
--- helpers/lh_buildbinary (revision 324)
+++ helpers/lh_buildbinary (working copy)
@@ -19,33 +19,25 @@
fi
done
+ if [ ! -d "${LIVE_CHROOT}"/etc/initramfs-tools ]
+ then
+ mkdir "${LIVE_CHROOT}"/etc/initramfs-tools
+ fi
if [ "${LIVE_TYPE}" = "Net" ]
then
- # Mount proc
- mount proc-live -t proc "${LIVE_CHROOT}"/proc
-
- # Installing smbfs
- lh_chroot "aptitude install --assume-yes smbfs"
-
- # Unmount proc
- umount "${LIVE_CHROOT}"/proc
-
- if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ]
- then
- if [ ! -d "${LIVE_CHROOT}"/etc/initramfs-tools ]
- then
- mkdir "${LIVE_CHROOT}"/etc/initramfs-tools
- fi
-
- # Configuring initramfs for NFS
+ # Configuring initramfs for NFS
cat >> "${LIVE_CHROOT}"/etc/initramfs-tools/initramfs.conf << EOF
MODULES=netboot
BOOT=nfs
-NFSROOT=auto
EOF
- lh_chroot "update-initramfs -tu"
- fi
+ else
+ # Configuring initramfs for ISO or USB
+cat >> "${LIVE_CHROOT}"/etc/initramfs-tools/initramfs.conf << EOF
+MODULES=most
+BOOT=local
+EOF
fi
+ lh_chroot "update-initramfs -tu"
lh_cleanapt
Index: src/lists/kde-i18n
===================================================================
--- src/lists/kde-i18n (revision 324)
+++ src/lists/kde-i18n (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-i18n - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-full-i18n
===================================================================
--- src/lists/kde-full-i18n (revision 324)
+++ src/lists/kde-full-i18n (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full-i18n - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-extra
===================================================================
--- src/lists/kde-extra (revision 324)
+++ src/lists/kde-extra (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/gnustep
===================================================================
--- src/lists/gnustep (revision 324)
+++ src/lists/gnustep (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/xfce
===================================================================
--- src/lists/xfce (revision 324)
+++ src/lists/xfce (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/xfce - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/minimal
===================================================================
--- src/lists/minimal (revision 324)
+++ src/lists/minimal (working copy)
@@ -1,4 +1,4 @@
# /usr/share/make-live/lists/minimal - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
Index: src/lists/rescue
===================================================================
--- src/lists/rescue (revision 324)
+++ src/lists/rescue (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/rescue - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-core
===================================================================
--- src/lists/kde-core (revision 324)
+++ src/lists/kde-core (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/xfce-junior
===================================================================
--- src/lists/xfce-junior (revision 324)
+++ src/lists/xfce-junior (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/xfce - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/gnome-core
===================================================================
--- src/lists/gnome-core (revision 324)
+++ src/lists/gnome-core (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-core - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/mini
===================================================================
--- src/lists/mini (revision 324)
+++ src/lists/mini (working copy)
@@ -1,4 +1,4 @@
# /usr/share/make-live/lists/mini - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
Index: src/lists/x11-core
===================================================================
--- src/lists/x11-core (revision 324)
+++ src/lists/x11-core (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/x11-core - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/standard
===================================================================
--- src/lists/standard (revision 324)
+++ src/lists/standard (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/standard - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-extra-i18n
===================================================================
--- src/lists/kde-extra-i18n (revision 324)
+++ src/lists/kde-extra-i18n (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-extra-i18n - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-full
===================================================================
--- src/lists/kde-full (revision 324)
+++ src/lists/kde-full (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-full - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde
===================================================================
--- src/lists/kde (revision 324)
+++ src/lists/kde (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/gnome-full
===================================================================
--- src/lists/gnome-full (revision 324)
+++ src/lists/gnome-full (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome-full - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/gnome
===================================================================
--- src/lists/gnome (revision 324)
+++ src/lists/gnome (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-core-i18n
===================================================================
--- src/lists/kde-core-i18n (revision 324)
+++ src/lists/kde-core-i18n (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde-core-i18n - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/kde-junior
===================================================================
--- src/lists/kde-junior (revision 324)
+++ src/lists/kde-junior (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/kde - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/gnome-junior
===================================================================
--- src/lists/gnome-junior (revision 324)
+++ src/lists/gnome-junior (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/gnome - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/x11
===================================================================
--- src/lists/x11 (revision 324)
+++ src/lists/x11 (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/x11 - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
Index: src/lists/minimal-net
===================================================================
--- src/lists/minimal-net (revision 324)
+++ src/lists/minimal-net (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/minimal-net - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Network
bind9-host dhcp-client dnsutils ftp ifupdown iptables iputils-ping mtr-tiny
Index: src/lists/standard-i18n
===================================================================
--- src/lists/standard-i18n (revision 324)
+++ src/lists/standard-i18n (working copy)
@@ -1,7 +1,7 @@
# /usr/share/make-live/lists/standard-i18n - package list for make-live(1)
# Minimal
-eject file sudo vim-tiny
+eject file sudo vim-tiny smbfs
# Standard
console-common locales
_______________________________________________
Debian-live-devel mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-live-devel
