@DPATCH@
-Index: live-boot-grml/hooks/live
-===================================================================
---- live-boot-grml.orig/hooks/live 2011-12-06 22:10:13.000000000 +0100
-+++ live-boot-grml/hooks/live 2011-12-06 22:10:17.000000000 +0100
+--- a/hooks/live
++++ b/hooks/live
@@ -40,6 +40,12 @@
done
fi
@DPATCH@
-Index: b/scripts/live-functions
-===================================================================
---- a/scripts/live-functions 2011-07-24 22:07:22.000000000 +0200
-+++ b/scripts/live-functions 2011-07-24 22:07:56.000000000 +0200
+--- a/scripts/live-functions
++++ b/scripts/live-functions
@@ -88,14 +88,20 @@
printf " ${DEB_1}\n"
printf " ${DEB_2} \033[1;37mBOOT FAILED!\033[0m\n"
## DP: Pseudo-brand as grml
@DPATCH@
-Index: b/scripts/live
-===================================================================
---- a/scripts/live 2011-07-24 22:07:58.000000000 +0200
-+++ b/scripts/live 2011-07-24 22:07:59.000000000 +0200
-@@ -16,9 +16,9 @@
- root_snapshot_label="live-sn"
- home_snapshot_label="home-sn"
+--- a/scripts/live
++++ b/scripts/live
+@@ -11,7 +11,7 @@
+ alt_mountpoint="/media"
+ LIVE_MEDIA_PATH="live"
--USERNAME="user"
--USERFULLNAME="Live user"
-HOSTNAME="host"
-+USERNAME="grml"
-+USERFULLNAME="grml user"
+HOSTNAME="grml"
mkdir -p "${mountpoint}"
hostname of the booted system according to the DNS information.
This patch takes care of the netboot case.
-Index: b/scripts/live
-===================================================================
---- a/scripts/live 2011-07-24 22:07:59.000000000 +0200
-+++ b/scripts/live 2011-07-24 22:08:02.000000000 +0200
-@@ -220,6 +220,11 @@
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -202,6 +202,11 @@
export NOACCESSIBILITY
;;
## DP: * no bootid.txt + ignore_bootid=... => boots
@DPATCH@
-Index: live-boot-grml/scripts/live
-===================================================================
---- live-boot-grml.orig/scripts/live 2011-12-06 22:10:24.000000000 +0100
-+++ live-boot-grml/scripts/live 2011-12-06 22:10:25.000000000 +0100
-@@ -63,6 +63,11 @@
- export ACCESS
- ;;
-
-+ bootid=*)
-+ BOOTID="${ARGUMENT#bootid=}"
-+ export BOOTID
-+ ;;
-+
- console=*)
- DEFCONSOLE="${ARGUMENT#*=}"
- export DEFCONSOLE
-@@ -144,6 +149,11 @@
- export FROMISO
- ;;
-
-+ ignore_bootid)
-+ IGNORE_BOOTID="Yes"
-+ export IGNORE_BOOTID
-+ ;;
-+
- ignore_uuid)
- IGNORE_UUID="Yes"
- export IGNORE_UUID
-@@ -457,6 +467,42 @@
+--- a/scripts/live
++++ b/scripts/live
+@@ -52,6 +52,42 @@
return 1
}
matches_uuid ()
{
if [ "${IGNORE_UUID}" ] || [ ! -e /conf/uuid.conf ]
-@@ -1785,7 +1831,7 @@
+@@ -1350,7 +1386,7 @@
fi
if is_live_path ${mountpoint} && \
then
echo ${mountpoint}
return 0
-@@ -1881,19 +1927,6 @@
+@@ -1446,19 +1482,6 @@
return 0
fi
done
fi
done
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -45,6 +45,11 @@
+ export ACCESS
+ ;;
+
++ bootid=*)
++ BOOTID="${ARGUMENT#bootid=}"
++ export BOOTID
++ ;;
++
+ console=*)
+ DEFCONSOLE="${ARGUMENT#*=}"
+ export DEFCONSOLE
+@@ -126,6 +131,11 @@
+ export FROMISO
+ ;;
+
++ ignore_bootid)
++ IGNORE_BOOTID="Yes"
++ export IGNORE_BOOTID
++ ;;
++
+ ignore_uuid)
+ IGNORE_UUID="Yes"
+ export IGNORE_UUID
@DPATCH@
-Index: b/scripts/live
-===================================================================
---- a/scripts/live 2011-07-24 22:08:06.000000000 +0200
-+++ b/scripts/live 2011-07-24 22:08:09.000000000 +0200
-@@ -93,6 +93,8 @@
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -75,6 +75,8 @@
nodhcp)
unset DHCP
@DPATCH@
index d79beed..1b6926e 100755
-Index: live-boot-grml/scripts/live
-===================================================================
---- live-boot-grml.orig/scripts/live 2011-12-06 22:10:34.000000000 +0100
-+++ live-boot-grml/scripts/live 2011-12-06 22:10:34.000000000 +0100
-@@ -619,7 +619,7 @@
+--- a/scripts/live
++++ b/scripts/live
+@@ -202,7 +202,7 @@
if [ -z "${MODULETORAM}" ]
then
else
MODULETORAMFILE="${copyfrom}/${LIVE_MEDIA_PATH}/${MODULETORAM}"
-@@ -695,8 +695,7 @@
+@@ -278,8 +278,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
@DPATCH@
--- a/scripts/live
+++ b/scripts/live
-@@ -77,6 +77,18 @@
- BOOTIF="${x#BOOTIF=}"
- ;;
-
-+ dns=*)
-+ DNSSERVER="${ARGUMENT#*=}"
-+ if echo "${DNSSERVER}" | grep -q , ; then
-+ DNSSERVER1="${DNSSERVER%,*}"
-+ DNSSERVER2="${DNSSERVER#*,}"
-+ export DNSSERVER1 DNSSERVER2
-+ else
-+ DNSSERVER1="$DNSSERVER"
-+ export DNSSERVER1
-+ fi
-+ unset DNSSERVER
-+ ;;
- debug)
- DEBUG="Yes"
- export DEBUG
-@@ -846,7 +858,7 @@
+@@ -429,7 +429,7 @@
echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
fi
+ echo "nameserver $i" >> $RESOLVCONF
+ done
+fi
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -59,6 +59,19 @@
+ BOOTIF="${x#BOOTIF=}"
+ ;;
+
++ dns=*)
++ DNSSERVER="${ARGUMENT#*=}"
++ if echo "${DNSSERVER}" | grep -q , ; then
++ DNSSERVER1="${DNSSERVER%,*}"
++ DNSSERVER2="${DNSSERVER#*,}"
++ export DNSSERVER1 DNSSERVER2
++ else
++ DNSSERVER1="$DNSSERVER"
++ export DNSSERVER1
++ fi
++ unset DNSSERVER
++ ;;
++
+ debug)
+ DEBUG="Yes"
+ export DEBUG
@DPATCH@
-Index: live-boot-grml/scripts/live
-===================================================================
---- live-boot-grml.orig/scripts/live 2011-12-06 22:10:37.000000000 +0100
-+++ live-boot-grml/scripts/live 2011-12-06 22:10:39.000000000 +0100
-@@ -110,9 +110,8 @@
- ;;
-
- ethdevice=*)
-- DEVICE="${ARGUMENT#ethdevice=}"
-- ETHDEVICE="${DEVICE}"
-- export DEVICE ETHDEVICE
-+ ETHDEVICE="${ARGUMENT#ethdevice=}"
-+ export ETHDEVICE
- ;;
-
- ethdevice-timeout=*)
-@@ -179,13 +178,9 @@
- ;;
-
- ip=*)
-- STATICIP="${ARGUMENT#ip=}"
--
-- if [ -z "${STATICIP}" ]
-- then
-- STATICIP="frommedia"
-- fi
--
-+ # copy complete ip=args into staticip, and
-+ # keep multiple uses.
-+ STATICIP="${STATICIP} ${ARGUMENT}"
- export STATICIP
- ;;
-
-@@ -723,6 +718,24 @@
+--- a/scripts/live
++++ b/scripts/live
+@@ -294,6 +294,24 @@
return 0
}
do_netsetup ()
{
modprobe -q af_packet # For DHCP
-@@ -733,9 +746,19 @@
+@@ -304,9 +322,19 @@
[ -n "$ETHDEV_TIMEOUT" ] || ETHDEV_TIMEOUT=15
echo "Using timeout of $ETHDEV_TIMEOUT seconds for network configuration."
# support for Syslinux IPAPPEND parameter
-@@ -778,7 +801,7 @@
+@@ -349,7 +377,7 @@
if [ "$bootif_mac" = "$current_mac" ]
then
break
fi
fi
-@@ -790,12 +813,7 @@
+@@ -361,12 +389,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=..."
fi
# split args of ethdevice=eth0,eth1 into "eth0 eth1"
-@@ -803,38 +821,27 @@
+@@ -374,38 +397,27 @@
devlist="$devlist $device"
done
for interface in ${DEVICE}; do
# source relevant ipconfig output
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -93,9 +93,8 @@
+ ;;
+
+ ethdevice=*)
+- DEVICE="${ARGUMENT#ethdevice=}"
+- ETHDEVICE="${DEVICE}"
+- export DEVICE ETHDEVICE
++ ETHDEVICE="${ARGUMENT#ethdevice=}"
++ export ETHDEVICE
+ ;;
+
+ ethdevice-timeout=*)
+@@ -162,13 +161,9 @@
+ ;;
+
+ ip=*)
+- STATICIP="${ARGUMENT#ip=}"
+-
+- if [ -z "${STATICIP}" ]
+- then
+- STATICIP="frommedia"
+- fi
+-
++ # copy complete ip=args into staticip, and
++ # keep multiple uses.
++ STATICIP="${STATICIP} ${ARGUMENT}"
+ export STATICIP
+ ;;
+
So lets drop the localized manpages and just install the english ones.
-Index: b/Makefile
-===================================================================
---- a/Makefile 2011-07-24 22:07:22.000000000 +0200
-+++ b/Makefile 2011-07-24 22:08:15.000000000 +0200
-@@ -66,15 +66,6 @@
+--- a/Makefile
++++ b/Makefile
+@@ -66,14 +66,6 @@
install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
done
- do \
- for MANPAGE in manpages/$${LANGUAGE}/*; \
- do \
-- SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+- SECTION="$$(basename $${MANPAGE} | sed -e 's|\.|\n|g' | tail -n1)"; \
- install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/$${LANGUAGE}/man$${SECTION}/$$(basename $${MANPAGE} .$${LANGUAGE}.$${SECTION}).$${SECTION}; \
- done; \
- done
--
+
uninstall:
# Uninstalling executables
- rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
-Index: live-boot-grml/Makefile
-===================================================================
---- live-boot-grml.orig/Makefile 2011-12-06 22:08:57.000000000 +0100
-+++ live-boot-grml/Makefile 2011-12-06 22:09:19.000000000 +0100
+--- a/Makefile
++++ b/Makefile
@@ -52,11 +52,11 @@
cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
# Installing docs
- mkdir -p $(DESTDIR)/usr/share/doc/live-boot
-- cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot
+- cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot
+ mkdir -p $(DESTDIR)/usr/share/doc/live-boot-grml
-+ cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-boot-grml
++ cp -r COPYING $(DESTDIR)/usr/share/doc/live-boot-grml
- mkdir -p $(DESTDIR)/usr/share/doc/live-boot/examples
- cp -r etc/* $(DESTDIR)/usr/share/doc/live-boot/examples
# (FIXME)
# Installing manpages
-@@ -85,7 +85,7 @@
+@@ -94,7 +94,7 @@
rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr > /dev/null 2>&1 || true
# Uninstalling docs
phram doesn't work on first modprobe, when loading once again it seems
to work. So let's try it this way.
-diff --git a/scripts/live b/scripts/live
-index 23d0bbc..e5d3186 100755
--- a/scripts/live
+++ b/scripts/live
-@@ -1840,6 +1840,7 @@ mountroot ()
+@@ -1576,6 +1576,7 @@
then
# We found a memdisk, set up phram
modprobe phram phram=memdisk,${MEMDISK}
19_revert_toram_bootoption_to_expected_behaviour.patch
26_support_dns_bootoption.patch
27_support_static_ip.patch
-28_remove_localized_manpages.patch
+# 28_remove_localized_manpages.patch
29_support_dns_in_initramfs.patch
30_support_multiarch_dns.patch
31_package_rename.patch
projects / live-boot-grml.git / commitdiff