diff options
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 9 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 7 |
2 files changed, 12 insertions, 4 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 6aa08e39..ee3a151e 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -80,6 +80,11 @@ config_distro () { -e "/# This next bit can/a\ /sbin/udevadm trigger" \ -e "/# We need the uevent/,/# It's all over/d" \ -e "/# Log things that/,/kill \$UDEV/d" -i /mnt/etc/init.d/udev + + # clean the mountall.sh script as only swap activation needed + sed -e "3i# Script modified during SLX stage3 bootup (config_distro)" \ + -e "/pre_mountall/,/post_mountall/d" \ + -i /mnt/etc/init.d/mountall.sh } # initial (boot time) runlevel scripts @@ -88,8 +93,8 @@ local count=10 # boot.slx is a special runlevel script generated within initialramfs which # should be executed before the normal runlevel scripts. Proper shutdown is # not needed!? -for i in mountkernfs.sh mountdevsubfs.sh keyboard-setup procps bootlogd \ -hwclock.sh sudo console-setup udev boot.slx $D_SPLASHY; do +for i in mountkernfs.sh mountall.sh mountdevsubfs.sh keyboard-setup procps \ +bootlogd hwclock.sh sudo console-setup udev boot.slx $D_SPLASHY; do count=$(($count + 1)) [ $DEBUGLEVEL -ge 2 ] && echo "boot-runlevelscript $i" ln -sf /etc/init.d/$i /mnt/etc/rcS.d/S${count}$i diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 620f5232..eacee787 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -144,10 +144,13 @@ noexec\t 0 0" >>/tmp/fstab elif [ ${partid} -eq 45 ] ; then # if more than one id45 present, the latter ones are simply mounted # over the previous - ln -sf /mnt/media/${hdpartnr#/dev/*} /mnt/var/scratch + mount -t auto ${hdpartnr} /mnt/media/${hdpartnr#/dev/*} & + ln -sf /media/${hdpartnr#/dev/*} /mnt/var/scratch elif [ ${partid} -eq 46 ] ; then # mount a home directory to (/mnt)/var/home - ln -sf /mnt/media/${hdpartnr#/dev/*} /mnt/var/home + mount -t auto ${hdpartnr} /mnt/media/${hdpartnr#/dev/*} & + test -d /mnt/media/${hdpartnr#/dev/*}/home && \ + ln -sf /media/${hdpartnr#/dev/*} /mnt/var/home fi done done |