projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'debian'
[live-boot-grml.git]
/
components
/
9990-main.sh
diff --git
a/components/9990-main.sh
b/components/9990-main.sh
index
e67176e
..
0c0bd68
100755
(executable)
--- a/
components/9990-main.sh
+++ b/
components/9990-main.sh
@@
-16,8
+16,6
@@
Live ()
tail -f boot.log >&7 &
tailpid="${!}"
tail -f boot.log >&7 &
tailpid="${!}"
- . /live.vars
-
LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}"
Cmdline_old
LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}"
Cmdline_old
@@
-60,6
+58,7
@@
Live ()
then
# We found a memdisk, set up phram
modprobe phram phram=memdisk,${MEMDISK}
then
# We found a memdisk, set up phram
modprobe phram phram=memdisk,${MEMDISK}
+ modprobe phram phram=memdisk,${MEMDISK}
# Load mtdblock, the memdisk will be /dev/mtdblock0
modprobe mtdblock
# Load mtdblock, the memdisk will be /dev/mtdblock0
modprobe mtdblock
@@
-150,15
+149,6
@@
Live ()
log_end_msg
log_end_msg
- # unionfs-fuse needs /dev to be bind-mounted for the duration of
- # live-bottom; udev's init script will take care of things after that
- case "${UNIONTYPE}" in
- unionfs-fuse)
- mount -n -o bind /dev "${rootmnt}/dev"
- ;;
- esac
-
-
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
# causing a failure for example when accessing /var/lib/fai
# aufs2 in kernel versions around 2.6.33 has a regression:
# directories can't be accessed when read for the first the time,
# causing a failure for example when accessing /var/lib/fai
@@
-180,10
+170,16
@@
Live ()
fi
fi
fi
fi
- if [ -f /etc/resolv.conf ] && [ ! -s ${rootmnt}/etc/resolv.conf ]
+ if [ -L /root/etc/resolv.conf ] ; then
+ # assume we have resolvconf
+ DNSFILE="${rootmnt}/etc/resolvconf/resolv.conf.d/base"
+ else
+ DNSFILE="${rootmnt}/etc/resolv.conf"
+ fi
+ if [ -f /etc/resolv.conf ] && [ ! -s ${DNSFILE} ]
then
then
- log_begin_msg "Copying /etc/resolv.conf to ${
rootmnt}/etc/resolv.conf
"
- cp -v /etc/resolv.conf ${
rootmnt}/etc/resolv.conf
+ log_begin_msg "Copying /etc/resolv.conf to ${
DNSFILE}
"
+ cp -v /etc/resolv.conf ${
DNSFILE}
log_end_msg
fi
log_end_msg
fi
@@
-197,11
+193,7
@@
Live ()
Swap
Swap
- case "${UNIONFS}" in
- unionfs-fuse)
- umount "${rootmnt}/dev"
- ;;
- esac
+ Grml_Networking
exec 1>&6 6>&-
exec 2>&7 7>&-
exec 1>&6 6>&-
exec 2>&7 7>&-