diff options
author | Sebastian Schmelzer | 2011-05-12 19:30:50 +0200 |
---|---|---|
committer | Sebastian Schmelzer | 2011-05-12 19:30:50 +0200 |
commit | b97e88bffea34d69fffa55db632e38c2b60a8ed0 (patch) | |
tree | a798c592dce7f22fbe493afebe572e85424924fd /src | |
parent | update vmchooser (diff) | |
parent | Add inclusion of /etc/functions before running do_mnt ... (diff) | |
download | core-b97e88bffea34d69fffa55db632e38c2b60a8ed0.tar.gz core-b97e88bffea34d69fffa55db632e38c2b60a8ed0.tar.xz core-b97e88bffea34d69fffa55db632e38c2b60a8ed0.zip |
Merge branch 'master' of openslx.org:openslx/core
Diffstat (limited to 'src')
-rwxr-xr-x | src/initramfs/scripts/bin/hwautocfg | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/initramfs/scripts/bin/hwautocfg b/src/initramfs/scripts/bin/hwautocfg index f5ceb165..bd920d50 100755 --- a/src/initramfs/scripts/bin/hwautocfg +++ b/src/initramfs/scripts/bin/hwautocfg @@ -210,8 +210,6 @@ noexec\t 0 0" >>/tmp/fstab fi done done - # add - [ -f /etc/do_mnt ] && sed -e "1i. /etc/functions" -i /etc/do_mnt done # determine if tmp preparation should wait for format/mount or not [ -z "$part44" ] && echo "finished at $(sysup)" >/tmp/tmpready @@ -226,7 +224,8 @@ fi finish () { mdev -s # mount filesystem parts (if any) requested in disk setup -[ -f /etc/do_mnt ] && sh /etc/do_mnt & +[ -f /etc/do_mnt ] && \ + { sed -e "1i. /etc/functions" -i /etc/do_mnt; sh /etc/do_mnt; } & # remove unneeded disk and mouse drivers [ ! -s /etc/hwinfo.disk ] && rmmod sd_mod 2>/dev/null #grep -q " PS/2 " /etc/hwinfo.mouse || \ |