Merge branch 'mru/quilt'
authorUlrich Dangel <mru@grml.org>
Mon, 13 Jun 2011 11:13:09 +0000 (13:13 +0200)
committerUlrich Dangel <mru@grml.org>
Mon, 13 Jun 2011 11:13:09 +0000 (13:13 +0200)
* mru/quilt:
  Remove old manpage live-snapshot.it.1.txt
  Fix patch offsets for quilt patches
  Add extra patch for fixing output message and partially revert 2ad3c30d9ef0cc1ea2c7df7e7f0862c4dc6dad5d
  Revert "Adding live-toram script to copy the running live system to ram and eject the live media."
  Add extra patch to support dns in initramfs
  Revert "support DNS in boot environment"
  Add extra patch to support dns with multiarch.
  Revert "Do not fail in multiarch environment when installing libnss_dns.so."
  Add extra patch for Drop installation of localized manpages from upstream Makefile.
  Revert "Drop installation of localized manpages from upstream Makefile."
  Use quilt instead of dpatch

29 files changed:
Makefile
bin/live-toram [deleted file]
debian/control
debian/patches/00list [deleted file]
debian/patches/01_fix_output_file.patch [new file with mode: 0644]
debian/patches/03_grml_version_file_hook.patch [moved from debian/patches/03_grml_version_file_hook.dpatch with 76% similarity, mode: 0644]
debian/patches/05_boot_failure_message_grml.patch [moved from debian/patches/05_boot_failure_message_grml.dpatch with 92% similarity, mode: 0644]
debian/patches/07_support_findiso.patch [moved from debian/patches/07_support_findiso.dpatch with 92% similarity, mode: 0644]
debian/patches/08_grml_defaults.patch [moved from debian/patches/08_grml_defaults.dpatch with 80% similarity, mode: 0644]
debian/patches/10_validateroot.patch [moved from debian/patches/10_validateroot.dpatch with 86% similarity, mode: 0644]
debian/patches/11_dhcphostname.patch [moved from debian/patches/11_dhcphostname.dpatch with 82% similarity, mode: 0644]
debian/patches/12_uuid_support.patch [moved from debian/patches/12_uuid_support.dpatch with 92% similarity, mode: 0644]
debian/patches/13_always_display_warnings_and_failures.patch [moved from debian/patches/13_always_display_warnings_and_failures.dpatch with 76% similarity, mode: 0644]
debian/patches/14_no_blkid_on_lenny.patch [moved from debian/patches/14_no_blkid_on_lenny.dpatch with 96% similarity, mode: 0644]
debian/patches/15_networking_grml.patch [moved from debian/patches/15_networking_grml.dpatch with 99% similarity, mode: 0644]
debian/patches/16_nodhcp.patch [moved from debian/patches/16_nodhcp.dpatch with 73% similarity, mode: 0644]
debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch [moved from debian/patches/19_revert_toram_bootoption_to_expected_behaviour.dpatch with 93% similarity, mode: 0644]
debian/patches/25_support_lvm_for_live-media.patch [moved from debian/patches/25_support_lvm_for_live-media.dpatch with 95% similarity, mode: 0644]
debian/patches/26_support_dns_bootoption.patch [moved from debian/patches/26_support_dns_bootoption.dpatch with 62% similarity, mode: 0644]
debian/patches/27_support_static_ip.patch [moved from debian/patches/27_support_static_ip.dpatch with 72% similarity, mode: 0644]
debian/patches/28_remove_localized_manpages.patch [new file with mode: 0644]
debian/patches/29_support_dns_in_initramfs.patch [new file with mode: 0644]
debian/patches/30_support_multiarch_dns.patch [new file with mode: 0644]
debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch [deleted file]
debian/patches/series [new file with mode: 0644]
debian/rules
hooks/live
manpages/old/live-snapshot.it.1.txt [deleted file]
scripts/live

index 46de269..4e579a3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,15 @@ install:
                install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
        done
 
+       for LANGUAGE in $(LANGUAGES); \
+       do \
+               for MANPAGE in manpages/$${LANGUAGE}/*; \
+               do \
+                       SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+                       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
diff --git a/bin/live-toram b/bin/live-toram
deleted file mode 100755 (executable)
index b7740a2..0000000
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Read cmdline
-for _PARAMETER in $(cat /proc/cmdline)
-do
-       case "${_PARAMETER}" in
-               module=*)
-                       _MODULE="${_PARAMETER#module=}"
-                       ;;
-       esac
-done
-
-# Assemble filesystems
-if [ -z "${_MODULE}" ]
-then
-       _FILESYSTEMS="/live/image/live/filesystem.squashfs"
-else
-       for _FILESYSTEM in _MODULE
-       do
-               _FILESYSTEMS="${_FILESYSTEMS} /live/image/live/${_FILESYSTEM}"
-       done
-fi
-
-# Exit if system is not debian live
-if [ ! -d /live/image ]
-then
-       echo "E: live-toram only works on Debian Live systems."
-
-       exit 1
-fi
-
-# Exit if filesystem not accessible
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
-       if [ ! -r ${_FILESYSTEM} ]
-       then
-               echo "E: ${_FILESYSTEM}: No such file"
-               echo "I: live-toram already run?"
-
-               exit 1
-       fi
-done
-
-# Exit if user is unprivileged
-if [ "$(id -u)" -ne 0 ]
-then
-       echo "E: need root privileges"
-
-       exit 1
-fi
-
-# Exit if not enough free memory
-_SIZE=0
-
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
-       _SIZE="$((${_SIZE} + $(du ${_FILESYSTEM} | awk '{ print $1 }')))"
-       _MEMORY="$(awk '/MemFree/ { print $2 }' /proc/meminfo)"
-done
-
-case ${@} in
-       -f|--force)
-               echo "W: Ignoring memory constrains as requested"
-               ;;
-
-       *)
-               if [ $_MEMORY -lt $_SIZE ]
-               then
-                       echo "E: not enough free memory available."
-                       echo "I: images need ${_SIZE}kB, free memory is ${_MEMORY}kB."
-
-                       exit 1
-               fi
-               ;;
-esac
-
-# Copying image to memory
-echo "P: Copying images to memory."
-echo "P: This may take a while..."
-
-# FIXME: doesn't work with multiple filesystems
-for _FILESYSTEM in ${_FILESYSTEMS}
-do
-       if [ ! -x "$(which rsync 2>/dev/null)" ]
-       then
-               rsync -a --progress ${_FILESYSTEM} /tmp/live
-       else
-               cp -av ${_FILESYSTEM} /tmp/live
-       fi
-
-LANGUAGE=C LANG=C LC_ALL=C perl << EOF
-open LOOP, '</dev/loop0' or die $!;
-open DEST, '</tmp/live' or die $!;
-ioctl(LOOP, 0x4C06, fileno(DEST)) or die $!
-close LOOP;
-close DEST;
-EOF
-
-done
-
-# Unmounting live media
-_DEVICE="$(awk '/\/live\/image / { print $1 }' /proc/mounts)"
-
-if [ -d /live/image ]
-then
-       umount /live/image
-       rmdir --ignore-fail-on-non-empty /live/image || true
-fi
-
-# Ejecting live media if it is not an optical device
-if [ "$(expr substr ${_DEVICE} 1 2)" != "sd" ] && \
-   ! readlink /sys/block/$(expr substr ${_DEVICE} 6 3) | grep -q usb
-then
-       if [ ! -x "$(which rsync 2>/dev/null)" ]
-       then
-               eject -p -m ${_DEVICE} >/dev/null 2>&1
-       fi
-fi
index 996533e..c1ed2da 100644 (file)
@@ -2,7 +2,7 @@ Source: live-boot
 Section: misc
 Priority: optional
 Maintainer: Grml Team <team@grml.org>
-Build-Depends: debhelper (>= 8), dpatch
+Build-Depends: debhelper (>= 8), quilt
 Standards-Version: 3.9.2
 Homepage: http://live.debian.net/devel/live-boot/
 Vcs-Browser: http://git.grml.org/?p=live-boot-grml.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index fa8205e..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-03_grml_version_file_hook.dpatch
-05_boot_failure_message_grml.dpatch
-07_support_findiso.dpatch
-08_grml_defaults.dpatch
-10_validateroot.dpatch
-11_dhcphostname.dpatch
-12_uuid_support.dpatch
-13_always_display_warnings_and_failures.dpatch
-14_no_blkid_on_lenny.dpatch
-15_networking_grml.dpatch
-16_nodhcp.dpatch
-19_revert_toram_bootoption_to_expected_behaviour.dpatch
-25_support_lvm_for_live-media.dpatch
-26_support_dns_bootoption.dpatch
-27_support_static_ip.dpatch
diff --git a/debian/patches/01_fix_output_file.patch b/debian/patches/01_fix_output_file.patch
new file mode 100644 (file)
index 0000000..4dce5d4
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/scripts/live
++++ b/scripts/live
+@@ -1590,7 +1590,7 @@
+                               loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+                               devname="${loopdevname}"
+                       else
+-                              echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
++                              echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
+                       fi
+               fi
+       fi
old mode 100755 (executable)
new mode 100644 (file)
similarity index 76%
rename from debian/patches/03_grml_version_file_hook.dpatch
rename to debian/patches/03_grml_version_file_hook.patch
index 5909885..df27676
@@ -6,12 +6,10 @@
 
 @DPATCH@
 
-diff --git a/hooks/live b/hooks/live
-index b5d43f2..ef95275 100755
 --- a/hooks/live
 +++ b/hooks/live
-@@ -38,6 +38,12 @@ then
-        done
+@@ -40,6 +40,12 @@
+       done
  fi
  
 +# Grml version information:
@@ -22,4 +20,4 @@ index b5d43f2..ef95275 100755
 +
  # Handling live-boot
  
- # Configuration
+ [ "${QUIET}" ] || echo -n " "core
old mode 100755 (executable)
new mode 100644 (file)
similarity index 92%
rename from debian/patches/05_boot_failure_message_grml.dpatch
rename to debian/patches/05_boot_failure_message_grml.patch
index 8dd2886..1e31090
@@ -6,11 +6,9 @@
 
 @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"
old mode 100755 (executable)
new mode 100644 (file)
similarity index 92%
rename from debian/patches/07_support_findiso.dpatch
rename to debian/patches/07_support_findiso.patch
index 540165f..e0b0367
 # 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
                                ;;
  
@@ -26,7 +24,7 @@ index 5681362..12e795b 100755
                        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
  
@@ -56,7 +54,7 @@ index 5681362..12e795b 100755
                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
  
old mode 100755 (executable)
new mode 100644 (file)
similarity index 80%
rename from debian/patches/08_grml_defaults.dpatch
rename to debian/patches/08_grml_defaults.patch
index cca4824..89b0f3c
@@ -5,11 +5,9 @@
 ## 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"
  
@@ -22,4 +20,3 @@ index d79beed..04ad61e 100755
  
  mkdir -p "${mountpoint}"
  tried="/tmp/tried"
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 86%
rename from debian/patches/10_validateroot.dpatch
rename to debian/patches/10_validateroot.patch
index a813356..042fb19
@@ -5,8 +5,6 @@
 ## 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 @@
old mode 100755 (executable)
new mode 100644 (file)
similarity index 82%
rename from debian/patches/11_dhcphostname.dpatch
rename to debian/patches/11_dhcphostname.patch
index 162aa56..dbffc7c
@@ -11,11 +11,9 @@ Support 'nodhcphostname' option which will disable setting the
 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
                                ;;
  
@@ -27,4 +25,3 @@ index 9554b77..9270e9c 100755
                        nofastboot)
                                NOFASTBOOT="Yes"
                                export NOFASTBOOT
-
old mode 100755 (executable)
new mode 100644 (file)
similarity index 92%
rename from debian/patches/12_uuid_support.dpatch
rename to debian/patches/12_uuid_support.patch
index a8e6ccc..34cee3d
 ## 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
                                ;;
  
@@ -28,7 +26,7 @@ index abce3cd..851796c 100755
                        console=*)
                                DEFCONSOLE="${ARGUMENT#*=}"
                                export DEFCONSOLE
-@@ -140,6 +145,11 @@ Arguments ()
+@@ -144,6 +149,11 @@
                                export FROMISO
                                ;;
  
@@ -40,7 +38,7 @@ index abce3cd..851796c 100755
                        ignore_uuid)
                                IGNORE_UUID="Yes"
                                export IGNORE_UUID
-@@ -392,6 +402,42 @@ is_live_path ()
+@@ -410,6 +420,42 @@
        return 1
  }
  
@@ -83,7 +81,7 @@ index abce3cd..851796c 100755
  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} && \
@@ -92,7 +90,7 @@ index abce3cd..851796c 100755
                then
                        echo ${mountpoint}
                        return 0
-@@ -1665,19 +1711,6 @@ find_livefs ()
+@@ -1769,19 +1815,6 @@
                                        return 0
                                fi
                        done
old mode 100755 (executable)
new mode 100644 (file)
similarity index 76%
rename from debian/patches/13_always_display_warnings_and_failures.dpatch
rename to debian/patches/13_always_display_warnings_and_failures.patch
index 8a204bc..f85217f
@@ -5,8 +5,8 @@
 ## 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
old mode 100755 (executable)
new mode 100644 (file)
similarity index 96%
rename from debian/patches/14_no_blkid_on_lenny.dpatch
rename to debian/patches/14_no_blkid_on_lenny.patch
index 2b19366..75e1c1b
@@ -10,7 +10,7 @@
 @DPATCH@
 --- a/scripts/live
 +++ b/scripts/live
-@@ -1577,7 +1577,12 @@ check_dev ()
+@@ -1680,7 +1680,12 @@
  
        if is_supported_fs ${fstype}
        then
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from debian/patches/15_networking_grml.dpatch
rename to debian/patches/15_networking_grml.patch
index 81b4c0d..bb36204
@@ -119,4 +119,3 @@ diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_
 +
 +    echo>> $IFFILE
 +done
-+
old mode 100755 (executable)
new mode 100644 (file)
similarity index 73%
rename from debian/patches/16_nodhcp.dpatch
rename to debian/patches/16_nodhcp.patch
index 8f52d21..45a2e33
@@ -6,14 +6,12 @@
 
 @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
                                ;;
old mode 100755 (executable)
new mode 100644 (file)
similarity index 93%
rename from debian/patches/19_revert_toram_bootoption_to_expected_behaviour.dpatch
rename to debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
index 9c53cd6..d3717cd
@@ -29,7 +29,7 @@
 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
@@ -38,10 +38,7 @@ index d79beed..1b6926e 100755
        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
old mode 100755 (executable)
new mode 100644 (file)
similarity index 95%
rename from debian/patches/25_support_lvm_for_live-media.dpatch
rename to debian/patches/25_support_lvm_for_live-media.patch
index b43106a..db4336c
@@ -8,7 +8,7 @@
 
 --- a/scripts/live
 +++ b/scripts/live
-@@ -1509,6 +1509,21 @@ check_dev ()
+@@ -1669,6 +1669,21 @@
                        umount $mountpoint
                fi
        fi
old mode 100755 (executable)
new mode 100644 (file)
similarity index 62%
rename from debian/patches/26_support_dns_bootoption.dpatch
rename to debian/patches/26_support_dns_bootoption.patch
index f79d962..ce1fc47
@@ -5,11 +5,10 @@
 ## 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=*)
@@ -27,9 +26,8 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
                        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)
old mode 100755 (executable)
new mode 100644 (file)
similarity index 72%
rename from debian/patches/27_support_static_ip.dpatch
rename to debian/patches/27_support_static_ip.patch
index f08e133..03cd679
@@ -6,26 +6,24 @@
 
 @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}" ]
@@ -36,13 +34,13 @@ index 5681362..bf20cce 100755
 +                              # 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
@@ -63,11 +61,11 @@ index 5681362..bf20cce 100755
 +
  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
@@ -84,22 +82,22 @@ index 5681362..bf20cce 100755
 +      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
@@ -107,13 +105,13 @@ index 5681362..bf20cce 100755
 -                      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
@@ -130,13 +128,13 @@ index 5681362..bf20cce 100755
 +              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
@@ -145,9 +143,9 @@ index 5681362..bf20cce 100755
 +              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
@@ -160,6 +158,6 @@ index 5681362..bf20cce 100755
 -      fi
 +      done
 +      unset devlist
-
-       for interface in ${DEVICE}; do
-               # source relevant ipconfig output
+       for interface in ${DEVICE}; do
+               # source relevant ipconfig output
diff --git a/debian/patches/28_remove_localized_manpages.patch b/debian/patches/28_remove_localized_manpages.patch
new file mode 100644 (file)
index 0000000..327667c
--- /dev/null
@@ -0,0 +1,31 @@
+commit ebdefd9601c017c5a7264a94cee2c7af914bca76
+Author: Michael Prokop <mika@grml.org>
+Date:   Wed Jun 8 10:19:29 2011 +0200
+
+    Drop installation of localized manpages from upstream Makefile.
+    
+    Upstream's Makefile currently results in:
+    
+      E: live-boot: manpage-in-wrong-directory usr/share/man/en/man/live-boot.7..gz
+      E: live-boot: manpage-in-wrong-directory usr/share/man/en/man/live-snapshot.1..gz
+    
+    So lets drop the localized manpages and just install the english ones.
+
+--- a/Makefile
++++ b/Makefile
+@@ -66,15 +66,6 @@
+               install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
+       done
+-      for LANGUAGE in $(LANGUAGES); \
+-      do \
+-              for MANPAGE in manpages/$${LANGUAGE}/*; \
+-              do \
+-                      SECTION="$$(basename $${MANPAGE} | awk -F. '{ print $$3 }')"; \
+-                      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
diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
new file mode 100644 (file)
index 0000000..856913d
--- /dev/null
@@ -0,0 +1,35 @@
+commit 10caf0b2db3fc04fae24ca896cf21f6aed12bbbc
+Author: Christian Hofstaedtler <ch@grml.org>
+Date:   Fri Mar 25 23:02:38 2011 +0100
+
+    support DNS in boot environment
+    
+    Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
+
+--- a/hooks/live
++++ b/hooks/live
+@@ -258,17 +258,14 @@
+       manual_add_modules crc32c
+ fi
+-if [ "${LIVE_DNS}" = "true" ]
+-then
+-      [ "${QUIET}" ] || echo -n " "dns
+-      #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
++# 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
+ if [ "${LIVE_UNIONMOUNT}" = "true" ]
+ then
diff --git a/debian/patches/30_support_multiarch_dns.patch b/debian/patches/30_support_multiarch_dns.patch
new file mode 100644 (file)
index 0000000..90d1b66
--- /dev/null
@@ -0,0 +1,34 @@
+commit 6666658535b255cb71d48ddeb415aeb3023e1251
+Author: Michael Prokop <mika@grml.org>
+Date:   Tue Jun 7 10:15:52 2011 +0200
+
+    Do not fail in multiarch environment when installing libnss_dns.so.
+    
+    Updating initramfs fails with:
+    
+    | live-boot: core filesystems devices utils:memdisk udev wget blockdevE: /usr/share/initramfs-tools/hooks/live failed with return 1.
+    
+    with multiarch libc because the filename is no longer necessarily
+    /lib/libnss_dns.so.* but could also be e.g.
+    /lib/x86_64-linux-gnu/libnss_dns.so.*.
+
+--- a/hooks/live
++++ b/hooks/live
+@@ -260,7 +260,16 @@
+ # DNS for initramfs
+ #copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
+-copy_exec /lib/libnss_dns.so.*      /lib  # DNS server
++# DNS server:
++if ls /lib/libnss_dns.so.* >/dev/null 2>&1 ; then # non-multiarch libc
++        copy_exec /lib/libnss_dns.so.*      /lib
++elif ls /lib/*/libnss_dns.so.* >/dev/null 2>&1 ; then # multiarch libc
++        for libnss in /lib/*/libnss_dns.so.* ; do
++                copy_exec "$libnss"
++        done
++else
++        echo "Warning: libnss_dns.so.* not found. DNS in initramfs not functional."
++fi
+ #copy_exec /lib/libnss_compat.so.*      /lib  # /etc/passwd
+ # Configuration file - may be needed if /etc/hosts is used.
diff --git a/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch b/debian/patches/disabled/09_fix_resolvconf_pxeboot.dpatch
deleted file mode 100755 (executable)
index 89bda0d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_fix_resolvconf_pxeboot.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix resolvconf handling when booting via PXE
-##
-## When installing grml for PXE boot the system has network after
-## boot but no usable DNS. /etc/resolv.conf is empty except the
-## warning to not edit this file manually but to use the resolvconf
-## tool.
-##
-## The problem is, that the 23networking scripte in the initrd
-## correctly creates the resolv.conf, but it's being overwritten by
-## the resolvconf utility on boot.
-##
-## The fix for now is to remove the symlink so resolvconf breaks
-## early and DNS is working then.
-
-@DPATCH@
-diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
-index 72aaf12..244eeca 100755
---- a/grml/23networking
-+++ b/grml/23networking
-@@ -110,6 +110,11 @@ EOF
-       then
-               if [ -f /netboot.config ]
-               then
-+                      if [ -h /root/etc/resolv.conf ]
-+                      then
-+                              rm /root/etc/resolv.conf
-+                      fi
-+
-                       # create a resolv.conf if it is not present or empty
-                       cp /netboot.config /root/var/log/netboot.config
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..cfc8b5d
--- /dev/null
@@ -0,0 +1,19 @@
+01_fix_output_file.patch
+03_grml_version_file_hook.patch
+05_boot_failure_message_grml.patch
+07_support_findiso.patch
+08_grml_defaults.patch
+10_validateroot.patch
+11_dhcphostname.patch
+12_uuid_support.patch
+13_always_display_warnings_and_failures.patch
+14_no_blkid_on_lenny.patch
+15_networking_grml.patch
+16_nodhcp.patch
+19_revert_toram_bootoption_to_expected_behaviour.patch
+25_support_lvm_for_live-media.patch
+26_support_dns_bootoption.patch
+27_support_static_ip.patch
+28_remove_localized_manpages.patch
+29_support_dns_in_initramfs.patch
+30_support_multiarch_dns.patch
index 3065213..6d9ad98 100755 (executable)
@@ -1,18 +1,13 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpatch/dpatch.make
-
-build: patch-stamp
+build:
        # this is needed because dpatch doesn't do file modes on diffs.
        chmod a+rx scripts/live-bottom/*
        # regular build.
        dh build
 
-clean: unpatch
-       dh clean
-
 %:
-       dh ${@}
+       dh ${@} --with quilt
 
 override_dh_auto_install:
        dh_auto_install -- DESTDIR=debian/live-boot
index b3de1e5..309c26f 100755 (executable)
@@ -252,23 +252,17 @@ then
        manual_add_modules crc32c
 fi
 
-# DNS for initramfs
-#copy_exec /lib/libnss_files.so.*      /lib  # /etc/hosts and /etc/passwd
-# DNS server:
-if ls /lib/libnss_dns.so.* >/dev/null 2>&1 ; then # non-multiarch libc
-        copy_exec /lib/libnss_dns.so.*      /lib
-elif ls /lib/*/libnss_dns.so.* >/dev/null 2>&1 ; then # multiarch libc
-        for libnss in /lib/*/libnss_dns.so.* ; do
-                copy_exec "$libnss"
-        done
-else
-        echo "Warning: libnss_dns.so.* not found. DNS in initramfs not functional."
+if [ "${LIVE_DNS}" = "true" ]
+then
+       [ "${QUIET}" ] || echo -n " "dns
+       #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
-#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
 
 if [ "${LIVE_UNIONMOUNT}" = "true" ]
 then
diff --git a/manpages/old/live-snapshot.it.1.txt b/manpages/old/live-snapshot.it.1.txt
deleted file mode 100644 (file)
index 2370de7..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-live-snapshot(1)
-================
-:man source: 1.157.3
-:man manual: Debian Live
-
-Name
-----
-live-snapshot - uno script per facilitare l'uso della persistenza sui sistemi live
-
-Synopsis
---------
-live-snapshot [-c|--cow **DIRECTORY**s] [-d|--device **DEVICE**] [-e|--exclude-list **FILE**] [-o|--output **FILE**] [-t|--type **TYPE**]
-
-live-snapshot [-r|--resync-string **STRING**]
-
-live-snapshot [-h|--help]
-
-live-snapshot [-u|--usage]
-
-live-snapshot [-v|--version]
-
-Description
------------
-
-live-snapshot `e uno script che pu`o essere usato per costruire un file immagine formattato
-correttamente per essere usato da live-initramfs(7); viene inoltre usato dallo script di
-init di live-initramfs in uscita per sincronizzare i device di snapshot riconosciuti al boot.
-
-Options
--------
-
-  -c, --cow **DIRECTORY**::
-
-specifica la directory da clonare nel file immagine. Il valore di default `e
-lo stesso default usato da live-initramfs per la sua directory COW (copy on
-write, un tempo situata in "/live/cow") ed `e sufficiente per gli usi comuni.
-Pu`o essere utile tuttavia specificare "/home" e come tipo "ext2" per
-preparare un file immagine adatto per essere montato da live-initramfs come
-"/home" al boot.
-
-  -d, --device **DEVICE**::
-
-seleziona il device dove il file/partizione di snapshot o persistenza dovr`a
-essere sistemato. Se il device non ha un filesystem, ne verr`a creato uno
-automaticamente, di tipo ext2 ed etichettato (label) in base al valore
-specificato nell'opzione "--output" o con un default. Se non viene specificato
-nessun device, verr`a usato un "tmpfs" linkato sul desktop dell'utente, in
-modo che port`a essere mosso dove si vuole.
-
-  -e, --exclude-list **FILE**::
-
-un file contenente una lista di file e percorsi che NON devono essere salvati.
-Questa lista verr`a inclusa nello snapshot per essere riutilizzata.
-
-  -o, --output **FILE**::
-
-il nome del file o l'etichetta (label) da usare per il file o la partizione di
-snapshot. Se non specificata, live-snapshot cercher\`a un file all'interno
-del device oppure user`a l'intera partizione.
-
-  -r, --resync-string **STRING**::
-
-usato internamente nelle sincronizzazioni dallo script di init di
-live-initramfs. Il formato pu\`o cambiare, usatelo a vostro rischio.
-
-  -f, --refresh::
-
-scatena la stessa operazione che verrebbe fatta al reboot o all'halt della
-macchina, provando a fare il resync degli snapshot trovati al boot, usabile
-per salvare le modifiche in vista di un crash o di una mancanza di corrente.
-
-  -t, --type **TYPE**::
-
-il tipo pu`o essere "cpio", "squashfs" o "ext2".
-
-  -h, --help::
-
-mostra l'aiuto ed esce
-
-  -u, --usage::
-
-mostra l'utilizzo ed esce
-
-  -v, --version::
-
-da informazioni sulla versione ed esce
-
-Files
------
-
-  /etc/live-snapshot.list
-
-Facoltativo, se presente cambia completamente il funzionamento di live-snapshot; solo i files e le directory elencate verranno effettivamente inclusi nello snapshot.
-Funziona attualmente solo con gli snapshot di tipo "cpio" e "partizione intera".
-
-  /etc/live-snapshot.exclude_list
-
-Facoltativo, se presente verrà utilizzato per filtrare i file da includere negli snapshot. Tutte i file che conterranno le stringhe elecate (come "grep -F -v") non verranno salvati da live-snapshot.
-Funziona attualmente solo con gli snapshot di tipo "cpio", "partizione intera" e "squashfs"; è utile per filtrare contenuti poco significativi come i file temporanei e la cache.
-
-See also
---------
-
-live-initramfs(8)
-
-Questo programma fa parte di live-initramfs.
-
-Bugs
-----
-
-Riportate i bug sul pacchetto live-initramfs
-link:http://packages.qa.debian.org/live-initramfs[http://packages.qa.debian.org/live-initramfs].
-
-Homepage
---------
-
-Ulteriori informazioni su progetto Debian Live possono essere trovate su
-link:http://debian-live.alioth.debian.org/[http://debian-live.alioth.debian.org/] e
-link:http://wiki.debian.org/DebianLive/[http://wiki.debian.org/DebianLive/].
-
-Authors
--------
-
-live-initramfs `e mantenuto da Daniel Baumann <daniel@debian.org> per il
-progetto Debian. live-initramfs `e un fork di
-link:http://packages.ubuntu.com/casper[casper]. casper `e stato scritto
-originariamente da Tollef Fog Heen <tfheen@canonical.com> e Matt Zimmerman
-<mdz@canonical.com>.
index 5681362..57a4d32 100755 (executable)
@@ -1590,7 +1590,7 @@ check_dev ()
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"
                        else
-                               echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
+                               echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
                        fi
                fi
        fi