summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-07-11 13:41:13 +0000
committerOlivier Blin <oblin@mandriva.com>2007-07-11 13:41:13 +0000
commite33fed9f2a056578e09246f040c4d83e02e59e95 (patch)
tree7fab47423c2ad07b659a25ea36788e845f3fe9b4
parentde8bd8d785e067e25e6131f03355f2baaea69539 (diff)
downloaddraklive-distro/mdv2007.0.tar
draklive-distro/mdv2007.0.tar.gz
draklive-distro/mdv2007.0.tar.bz2
draklive-distro/mdv2007.0.tar.xz
draklive-distro/mdv2007.0.zip
add commented support for additionnal modules (used for aKademy 2007.0)distro/mdv2007.0
-rwxr-xr-xdraklive6
1 files changed, 6 insertions, 0 deletions
diff --git a/draklive b/draklive
index 2547690..8a7e99d 100755
--- a/draklive
+++ b/draklive
@@ -352,6 +352,7 @@ sub create_initrd_for_media {
map { $live->{prefix}{live}{mnt} . $_ }
$live->{prefix}{media}{mnt},
$live->{mount}{root},
+ "/live/modules",
map { $_->{mountpoint} } @{$live->{mount}{dirs} || []};
#- use nash with label support
@@ -397,6 +398,9 @@ sub create_initrd_for_media {
qw(console initrd null ram systty),
(map { "tty$_" } 0..5),
(map { "loop$_" } 0..7);
+ #- pre-create devfsd compatibility loop devices (since busybox is still built with devfsd support)
+ mkdir_p($initrd_tree . "/dev/loop");
+ cp_af($initrd_tree . "/dev/loop$_", $initrd_tree . "/dev/loop/$_") foreach 0..7;
my $kernel = find_kernel($live);
print "using kernel $kernel\n";
@@ -467,6 +471,8 @@ sub create_initrd_linuxrc {
if_(@mount_options, " -o " . join(",", @mount_options)) .
" -t $fs " . get_media_setting($media, 'source') . " $live->{prefix}{live}{mnt}$live->{prefix}{media}{mnt}",
(map { $loop{$_->{type}}{mount}->($live, $_) } grep { $_->{type} } @{$live->{mount}{dirs} || []}),
+ #q|sh -c 'modules=; for m in /live/media/.loopbacks/modules/*; do n=$(basename $m); n=${n%.sqfs}; d=/live/modules/$n; mkdir -p $d; mount -n -o loop,ro -t squashfs $m $d && modules=$modules$d=ro:; done; echo $modules > /live-modules'|,
+ #q|sh -c 'mount -o dirs=/live/system=rw:$(cat /live-modules):/live/distrib=ro -t unionfs unionfs /live/union'|,
($live->{mount}{overlay} ? $overlay{$live->{mount}{overlay}}{mount}->($live) : ()),
"echo 0x0100 > /proc/sys/kernel/real-root-dev",
"umount /sys",