summaryrefslogtreecommitdiffstats
path: root/src/initramfs/scripts/bin/hwautocfg
diff options
context:
space:
mode:
authorDirk von Suchodoletz2011-05-12 19:07:53 +0200
committerDirk von Suchodoletz2011-05-12 19:07:53 +0200
commit582229061809e8936a5c9d0815afca394de91d29 (patch)
treeafeca5a0e68e8ece5c50567c41b80a24ffd648ef /src/initramfs/scripts/bin/hwautocfg
parentSmall changes for new Ubuntu 11.04 ... (diff)
downloadcore-582229061809e8936a5c9d0815afca394de91d29.tar.gz
core-582229061809e8936a5c9d0815afca394de91d29.tar.xz
core-582229061809e8936a5c9d0815afca394de91d29.zip
Add inclusion of /etc/functions before running do_mnt ...
Diffstat (limited to 'src/initramfs/scripts/bin/hwautocfg')
-rwxr-xr-xsrc/initramfs/scripts/bin/hwautocfg5
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 || \