@DPATCH@
-diff --git a/scripts/live-functions b/scripts/live-functions
-index 5efe432..faaf23e 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
-@@ -88,14 +88,20 @@ panic() {
+@@ -88,14 +88,20 @@
printf " ${DEB_1}\n"
printf " ${DEB_2} \033[1;37mBOOT FAILED!\033[0m\n"
printf " ${DEB_3}\n"
# file is searched inside that ISO file then.
@DPATCH@
-diff --git a/scripts/live b/scripts/live
-index 5681362..12e795b 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -106,6 +106,11 @@ Arguments ()
+@@ -106,6 +106,11 @@
export FETCH
;;
forcepersistentfsck)
FORCEPERSISTENTFSCK="Yes"
export FORCEPERSISTENTFSCK
-@@ -1629,13 +1634,28 @@ check_dev ()
+@@ -1629,13 +1634,28 @@
mount -t ${fstype} -o ro,noatime "${devname}" ${mountpoint} || continue
[ -n "$devuid" ] && echo "$devuid" >> $tried
fi
fi
-@@ -1933,6 +1953,22 @@ mountroot ()
+@@ -1933,6 +1953,22 @@
# when booting FAI, this simple workaround solves it
ls /root/* >/dev/null 2>&1
## DP: Pseudo-brand as grml
@DPATCH@
-diff --git a/scripts/live b/scripts/live
-index d79beed..04ad61e 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -16,9 +16,9 @@ home_persistence="home-rw"
+@@ -16,9 +16,9 @@
root_snapshot_label="live-sn"
home_snapshot_label="home-sn"
mkdir -p "${mountpoint}"
tried="/tmp/tried"
-
## DP: add live-bottom/10validateroot
@DPATCH@
-diff --git a/scripts/live-bottom/10validateroot b/scripts/live-bottom/10validateroot
-index 0000000..8d42afc
--- /dev/null
+++ b/scripts/live-bottom/10validateroot
@@ -0,0 +1,27 @@
hostname of the booted system according to the DNS information.
This patch takes care of the netboot case.
-diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
-index 9554b77..9270e9c 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -216,6 +216,11 @@ Arguments ()
+@@ -220,6 +220,11 @@
export NOACCESSIBILITY
;;
nofastboot)
NOFASTBOOT="Yes"
export NOFASTBOOT
-
## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
-diff --git a/scripts/live b/scripts/live
-index abce3cd..851796c 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -63,6 +63,11 @@ Arguments ()
+@@ -63,6 +63,11 @@
export ACCESS
;;
console=*)
DEFCONSOLE="${ARGUMENT#*=}"
export DEFCONSOLE
-@@ -140,6 +145,11 @@ Arguments ()
+@@ -144,6 +149,11 @@
export FROMISO
;;
ignore_uuid)
IGNORE_UUID="Yes"
export IGNORE_UUID
-@@ -392,6 +402,42 @@ is_live_path ()
+@@ -410,6 +420,42 @@
return 1
}
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1550,7 +1596,7 @@ check_dev ()
+@@ -1655,7 +1701,7 @@
fi
if is_live_path ${mountpoint} && \
then
echo ${mountpoint}
return 0
-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -1769,19 +1815,6 @@
return 0
fi
done
## DP: Always display failure and warning messages.
@DPATCH@
---- live-initramfs-grml~/scripts/live-functions 2010-02-20 16:03:43.155342432 +0100
-+++ live-initramfs-grml/scripts/live-functions 2010-02-20 16:04:08.675380352 +0100
+--- a/scripts/live-functions
++++ b/scripts/live-functions
@@ -2,6 +2,17 @@
. /scripts/functions
. /live.vars
@DPATCH@
--- a/scripts/live
+++ b/scripts/live
-@@ -1577,7 +1577,12 @@ check_dev ()
+@@ -1680,7 +1680,12 @@
if is_supported_fs ${fstype}
then
+
+ echo>> $IFFILE
+done
-+
@DPATCH@
-diff --git a/scripts/live b/scripts/live
-index 5681362..46ef54b 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -88,6 +88,8 @@ Arguments ()
+@@ -93,6 +93,8 @@
nodhcp)
- unset DHCP
+ unset DHCP
+ NODHCP="Yes"
+ export NODHCP
;;
index d79beed..1b6926e 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -484,7 +484,7 @@ copy_live_to ()
+@@ -563,7 +563,7 @@
if [ -z "${MODULETORAM}" ]
then
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
-index d79beed..57d1b41 100755
---- a/scripts/live
-+++ b/scripts/live
-@@ -553,8 +553,7 @@ copy_live_to ()
+@@ -639,8 +639,7 @@
echo " * Copying whole medium to RAM" 1>/dev/console
rsync -a --progress ${copyfrom}/* ${copyto} 1>/dev/console # "cp -a" from busybox also copies hidden files
else
--- a/scripts/live
+++ b/scripts/live
-@@ -1509,6 +1509,21 @@ check_dev ()
+@@ -1669,6 +1669,21 @@
umount $mountpoint
fi
fi
## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live live-boot-grml/scripts/live
---- live-boot-grml~/scripts/live 2011-05-03 17:03:57.483541293 +0200
-+++ live-boot-grml/scripts/live 2011-05-03 17:03:57.576874626 +0200
-@@ -73,6 +73,18 @@
- export DEFCONSOLE
+--- a/scripts/live
++++ b/scripts/live
+@@ -77,6 +77,18 @@
+ BOOTIF="${x#BOOTIF=}"
;;
+ dns=*)
debug)
DEBUG="Yes"
export DEBUG
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live-bottom/23networking_grml live-boot-grml/scripts/live-bottom/23networking_grml
---- live-boot-grml~/scripts/live-bottom/23networking_grml 2011-05-03 17:03:57.426874629 +0200
-+++ live-boot-grml/scripts/live-bottom/23networking_grml 2011-05-03 17:05:11.820206602 +0200
+--- a/scripts/live-bottom/23networking_grml
++++ b/scripts/live-bottom/23networking_grml
@@ -44,7 +44,12 @@
# prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
@DPATCH@
-diff --git a/scripts/live b/scripts/live
-index 5681362..bf20cce 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -91,9 +91,8 @@ Arguments ()
- ;;
-
- ethdevice=*)
+@@ -110,9 +110,8 @@
+ ;;
+
+ ethdevice=*)
- DEVICE="${ARGUMENT#ethdevice=}"
- ETHDEVICE="${DEVICE}"
- export DEVICE ETHDEVICE
+ ETHDEVICE="${ARGUMENT#ethdevice=}"
+ export ETHDEVICE
- ;;
-
- ethdevice-timeout=*)
-@@ -150,13 +149,9 @@ Arguments ()
- ;;
-
- ip=*)
+ ;;
+
+ ethdevice-timeout=*)
+@@ -179,13 +178,9 @@
+ ;;
+
+ ip=*)
- STATICIP="${ARGUMENT#ip=}"
-
- if [ -z "${STATICIP}" ]
+ # copy complete ip=args into staticip, and
+ # keep multiple uses.
+ STATICIP="${STATICIP} ${ARGUMENT}"
- export STATICIP
- ;;
-
-@@ -598,6 +593,24 @@ copy_live_to ()
- return 0
+ export STATICIP
+ ;;
+
+@@ -667,6 +662,24 @@
+ return 0
}
-
+
+get_ipconfig_para()
+{
+ if [ $# != 1 ] ; then
+
do_netsetup ()
{
- modprobe -q af_packet # For DHCP
-@@ -608,9 +621,19 @@ do_netsetup ()
- [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
- echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
-
+ modprobe -q af_packet # For DHCP
+@@ -677,9 +690,19 @@
+ [ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
+ echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
+
- if [ -z "${NETBOOT}" ] && [ -z "${FETCH}" ] && \
- [ -z "${HTTPFS}" ] && [ -z "${FTPFS}" ]
- then
+ for device in ${ALLDEVICES}; do
+ ipconfig -c none -d $device -t 1 2>/dev/null >/dev/null
+ done
-
-
- # support for Syslinux IPAPPEND parameter
-@@ -653,7 +676,7 @@ do_netsetup ()
-
- if [ "$bootif_mac" = "$current_mac" ]
- then
+
+
+ # support for Syslinux IPAPPEND parameter
+@@ -722,7 +745,7 @@
+
+ if [ "$bootif_mac" = "$current_mac" ]
+ then
- DEVICE=${device##*/}
+ ETHDEVICE="${device##*/},$ETHDEVICE" # use ethdevice
- break
- fi
- fi
-@@ -665,12 +688,7 @@ do_netsetup ()
- # for *every* present network device (except for loopback of course)
- if [ -z "$ETHDEVICE" ] ; then
- echo "If you want to boot from a specific device use bootoption ethdevice=..."
+ break
+ fi
+ fi
+@@ -734,12 +757,7 @@
+ # for *every* present network device (except for loopback of course)
+ if [ -z "$ETHDEVICE" ] ; then
+ echo "If you want to boot from a specific device use bootoption ethdevice=..."
- for device in /sys/class/net/*; do
- dev=${device##*/} ;
- if [ "$dev" != "lo" ] ; then
- fi
- done
+ ETHDEVICE="$ALLDEVICES"
- fi
-
- # split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -678,38 +696,27 @@ do_netsetup ()
- devlist="$devlist $device"
- done
-
+ fi
+
+ # split args of ethdevice=eth0,eth1 into "eth0 eth1"
+@@ -747,38 +765,27 @@
+ devlist="$devlist $device"
+ done
+
- # this is tricky (and ugly) because ipconfig sometimes just hangs/runs into
- # an endless loop; iff execution fails give it two further tries, that's
- # why we use '$devlist $devlist $devlist' for the other for loop
+ if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] ; then
+ echo "Ignoring network device $dev due to nodhcp." | tee -a /live-boot.log
+ continue
- fi
+ fi
+ echo "Executing ipconfig -t $ETHDEV_TIMEOUT $param"
+ ipconfig -t "$ETHDEV_TIMEOUT" "$param" | tee -a /netboot.config
-
- # if configuration of device worked we should have an assigned
- # IP address, iff so let's use the according as $DEVICE for later usage
- # simple and primitive approach which seems to work fine
+
+ # if configuration of device worked we should have an assigned
+ # IP address, iff so let's use the according as $DEVICE for later usage
+ # simple and primitive approach which seems to work fine
- if ifconfig $dev | grep -q 'inet.*addr:' ; then
- export DEVICE="$dev"
- break
+ if [ "${IPV4ADDR}" != "0.0.0.0" ]; then
+ export DEVICE="$dev $DEVICE"
+ # break # exit loop as we just use the irst
- fi
+ fi
- done
-
+
- else
- for interface in ${DEVICE}; do
- ipconfig -t "$ETHDEV_TIMEOUT" ${interface} | tee /netboot-${interface}.config
- fi
+ done
+ unset devlist
-
- for interface in ${DEVICE}; do
- # source relevant ipconfig output
+
+ for interface in ${DEVICE}; do
+ # source relevant ipconfig output
So lets drop the localized manpages and just install the english ones.
-diff --git a/Makefile b/Makefile
-index 4e579a3..46de269 100644
--- a/Makefile
+++ b/Makefile
-@@ -66,15 +66,6 @@ install:
+@@ -66,15 +66,6 @@
install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
done
Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
-diff --git a/hooks/live b/hooks/live
-index 309c26f..3862a60 100755
--- a/hooks/live
+++ b/hooks/live
-@@ -252,17 +252,14 @@ then
+@@ -258,17 +258,14 @@
manual_add_modules crc32c
fi
- #copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd
- copy_exec /lib/libnss_dns.so.* /lib # DNS server
- #copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd
--
-- # Configuration file - may be needed if /etc/hosts is used.
-- #mkdir -p $DESTDIR/etc
-- #cp -p /etc/nsswitch.conf $DESTDIR/etc
--fi
+# DNS for initramfs
+#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd
+copy_exec /lib/libnss_dns.so.* /lib # DNS server
+#copy_exec /lib/libnss_compat.so.* /lib # /etc/passwd
-+
+
+- # Configuration file - may be needed if /etc/hosts is used.
+- #mkdir -p $DESTDIR/etc
+- #cp -p /etc/nsswitch.conf $DESTDIR/etc
+-fi
+# Configuration file - may be needed if /etc/hosts is used.
+#mkdir -p $DESTDIR/etc
+#cp -p /etc/nsswitch.conf $DESTDIR/etc
/lib/libnss_dns.so.* but could also be e.g.
/lib/x86_64-linux-gnu/libnss_dns.so.*.
-diff --git a/hooks/live b/hooks/live
-index 3862a60..b3de1e5 100755
--- a/hooks/live
+++ b/hooks/live
-@@ -254,7 +254,16 @@ fi
+@@ -260,7 +260,16 @@
# DNS for initramfs
#copy_exec /lib/libnss_files.so.* /lib # /etc/hosts and /etc/passwd
projects / live-boot-grml.git / commitdiff