Merge branch 'ch/new_version'

Conflicts:
	Makefile
	31_package_rename.patch

diff --git a/Makefile b/Makefile
index 4e579a3..a2ab1b9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 SHELL := sh -e
 
-LANGUAGES = en $(shell cd manpages/po && ls)
+LANGUAGES = $(shell cd manpages/po && ls)
 
 SCRIPTS = bin/* hooks/* scripts/live scripts/live-functions scripts/live-helpers scripts/*/*
 
@@ -33,7 +33,7 @@ test:
                echo "W: checkbashisms - command not found"; \
                echo "I: checkbashisms can be optained from: "; \
                echo "I:   http://git.debian.org/?p=devscripts/devscripts.git"; \
-               echo "I: On Debian systems, checkbashisms can be installed with:"; \
+               echo "I: On Debian based systems, checkbashisms can be installed with:"; \
                echo "I:   apt-get install devscripts"; \
        fi
 
@@ -78,7 +78,7 @@ install:
 uninstall:
        # Uninstalling executables
        rm -f $(DESTDIR)/sbin/live-snapshot $(DESTDIR)/sbin/live-swapfile
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/sbin || true
 
        rm -rf $(DESTDIR)/usr/share/live-boot
 
@@ -86,18 +86,18 @@ uninstall:
        rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
        rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
 
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/hooks || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools/scripts || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/initramfs-tools || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
 
        # Uninstalling docs
        rm -rf $(DESTDIR)/usr/share/doc/live-boot
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
 
        # Uninstalling manpages
        for MANPAGE in manpages/en/*; \

diff --git a/VERSION b/VERSION
index 31cfe14..9ae56c3 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a17
+3.0~a19

diff --git a/bin/live-snapshot b/bin/live-snapshot
index eccabbc..82addab 100755 (executable)
--- a/bin/live-snapshot
+++ b/bin/live-snapshot
@@ -23,7 +23,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 #
-# On Debian systems, the complete text of the GNU General Public License
+# The complete text of the GNU General Public License
 # can be found in /usr/share/common-licenses/GPL-3 file.
 
 # declare here two vars from /etc/live.conf because of "set -u"
@@ -142,10 +142,10 @@ Version ()
        echo "along with this program; if not, write to the Free Software"
        echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
        echo
-       echo "On Debian systems, the complete text of the GNU General Public License"
+       echo "The complete text of the GNU General Public License"
        echo "can be found in /usr/share/common-licenses/GPL-3 file."
        echo
-       echo "Homepage: <http://debian-live.alioth.debian.org/>"
+       echo "Homepage: <http://live.debian.net/>"
 
        exit 0
 }

diff --git a/debian/changelog b/debian/changelog
index b4bffb0..997b433 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+live-boot (3.0~a19-1) unstable; urgency=low
+
+  * Correct rmdir call in top-level Makefiles uninstall target to not
+    fail if there was no prior live-boot installation.
+  * Making references to debian more distribution neutral.
+  * Replacing reference to old alioth page in live-snapshot.
+  * Splitting out documentation so that it can be accesses separately
+    from the initramfs code.
+  * Adding conflicts/replaces for live-boot to live-boot-doc to not
+    break upgrades.
+
+ -- Daniel Baumann <daniel@debian.org>  Wed, 13 Jul 2011 10:28:33 +0200
+
+live-boot (3.0~a18-1) unstable; urgency=low
+
+  * Updating and correcting sendsigs.omit support for /run (Closes:
+    #628188).
+  * Removing accidentally twice included English files when installing
+    manpages.
+
+ -- Daniel Baumann <daniel@debian.org>  Sat, 11 Jun 2011 11:24:15 +0200
+
 live-boot (3.0~a17-1+grml.01) unstable; urgency=low
 
   * [6666658] Do not fail in multiarch environment when

diff --git a/debian/control b/debian/control
index f3dfc05..14477ca 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,11 @@ Vcs-Git: git://git.grml.org/live-boot-grml.git
 
 Package: live-boot-grml
 Architecture: all
-Depends: ${misc:Depends}, live-boot-grml-initramfs-tools (=${binary:Version})
+Depends: ${misc:Depends}, live-boot-grml-initramfs-tools
+Recommends: live-boot-grml-doc, eject, file, rsync, uuid-runtime
 Conflicts: live-boot
 Replaces: live-boot
 Provides: live-boot
-Recommends: eject, file, rsync, uuid-runtime
 Suggests: curlftpfs, cryptsetup, httpfs2, unionfs-fuse, wget
 Description: Debian Live - System Boot Scripts
  live-boot contains the scripts that configure a Debian Live system during the
@@ -27,6 +27,22 @@ Description: Debian Live - System Boot Scripts
  This is NOT a fork of Debian's live-boot, it's just a customized
  version to better fit Grml's needs.
 
+Package: live-boot-grml-doc
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: live-boot (<< 3.0~a18~), live-boot-doc
+Replaces: live-boot, live-boot-doc
+Provides: live-boot-doc
+Description: Debian Live - System Boot Scripts (documentation)
+ live-boot contains the scripts that configure a Debian Live system during the
+ boot process (early userspace).
+ .
+ This package contains the documentation.
+ .
+ Please notice that this package is maintained by the grml.org team.
+ This is NOT a fork of Debian's live-boot, it's just a customized
+ version to better fit Grml's needs.
+
 Package: live-boot-grml-initramfs-tools
 Architecture: all
 Depends:

diff --git a/debian/live-boot-grml-doc.install b/debian/live-boot-grml-doc.install
new file mode 100644 (file)
index 0000000..0e373be
--- /dev/null
+++ b/debian/live-boot-grml-doc.install
@@ -0,0 +1,2 @@
+usr/share/doc
+usr/share/man

diff --git a/debian/live-boot-grml.init b/debian/live-boot-grml.init
index f0982a8..cd2e4cd 100644 (file)
--- a/debian/live-boot-grml.init
+++ b/debian/live-boot-grml.init
@@ -211,16 +211,9 @@ do_stop ()
 }
 
 case "${1}" in
-       restart|reload|force-reload|status)
+       start|restart|reload|force-reload|status)
                [ "${VERBOSE}" != no ] && log_end_msg 0
                ;;
-       start)
-               log_begin_msg "${NAME} is configuring sendsigs..."
-               if [ -f /live/root.pid ] ; then
-                       cat /live/root.pid >> /var/run/sendsigs.omit
-               fi
-               log_end_msg 0
-               ;;
 
        stop)
                log_begin_msg "${NAME} is resyncing snapshots and caching reboot files..."

diff --git a/debian/live-boot-grml.install b/debian/live-boot-grml.install
new file mode 100644 (file)
index 0000000..79474ce
--- /dev/null
+++ b/debian/live-boot-grml.install
@@ -0,0 +1,2 @@
+sbin
+usr/share/live-boot

diff --git a/debian/patches/01_fix_output_file.patch b/debian/patches/01_fix_output_file.patch
index 4dce5d4..455122c 100644 (file)
--- a/debian/patches/01_fix_output_file.patch
+++ b/debian/patches/01_fix_output_file.patch
@@ -1,5 +1,7 @@
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:07:22.000000000 +0200
++++ b/scripts/live     2011-07-24 22:07:54.000000000 +0200
 @@ -1590,7 +1590,7 @@
                                loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
                                devname="${loopdevname}"

diff --git a/debian/patches/03_grml_version_file_hook.patch b/debian/patches/03_grml_version_file_hook.patch
index df27676..fd7a7e5 100644 (file)
--- a/debian/patches/03_grml_version_file_hook.patch
+++ b/debian/patches/03_grml_version_file_hook.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
---- a/hooks/live
-+++ b/hooks/live
+Index: b/hooks/live
+===================================================================
+--- a/hooks/live       2011-07-24 22:07:22.000000000 +0200
++++ b/hooks/live       2011-07-24 22:07:55.000000000 +0200
 @@ -40,6 +40,12 @@
        done
  fi

diff --git a/debian/patches/05_boot_failure_message_grml.patch b/debian/patches/05_boot_failure_message_grml.patch
index 1e31090..ebcf436 100644 (file)
--- a/debian/patches/05_boot_failure_message_grml.patch
+++ b/debian/patches/05_boot_failure_message_grml.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
---- a/scripts/live-functions
-+++ b/scripts/live-functions
+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
 @@ -88,14 +88,20 @@
        printf "     ${DEB_1}\n"
        printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"

diff --git a/debian/patches/07_support_findiso.patch b/debian/patches/07_support_findiso.patch
index e0b0367..de1d9be 100644 (file)
--- a/debian/patches/07_support_findiso.patch
+++ b/debian/patches/07_support_findiso.patch
@@ -10,8 +10,10 @@
 # file is searched inside that ISO file then.
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:07:54.000000000 +0200
++++ b/scripts/live     2011-07-24 22:07:58.000000000 +0200
 @@ -106,6 +106,11 @@
                                export FETCH
                                ;;

diff --git a/debian/patches/08_grml_defaults.patch b/debian/patches/08_grml_defaults.patch
index 89b0f3c..b7e7a87 100644 (file)
--- a/debian/patches/08_grml_defaults.patch
+++ b/debian/patches/08_grml_defaults.patch
@@ -5,8 +5,10 @@
 ## DP: Pseudo-brand as grml
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+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"

diff --git a/debian/patches/10_validateroot.patch b/debian/patches/10_validateroot.patch
index 042fb19..59da1da 100644 (file)
--- a/debian/patches/10_validateroot.patch
+++ b/debian/patches/10_validateroot.patch
@@ -5,8 +5,10 @@
 ## DP: add live-bottom/10validateroot
 
 @DPATCH@
---- /dev/null
-+++ b/scripts/live-bottom/10validateroot
+Index: b/scripts/live-bottom/10validateroot
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/scripts/live-bottom/10validateroot       2011-07-24 22:08:00.000000000 +0200
 @@ -0,0 +1,27 @@
 +#!/bin/sh
 +

diff --git a/debian/patches/11_dhcphostname.patch b/debian/patches/11_dhcphostname.patch
index dbffc7c..c00a8b8 100644 (file)
--- a/debian/patches/11_dhcphostname.patch
+++ b/debian/patches/11_dhcphostname.patch
@@ -11,8 +11,10 @@ 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.
 
---- a/scripts/live
-+++ b/scripts/live
+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 @@
                                export NOACCESSIBILITY
                                ;;

diff --git a/debian/patches/12_uuid_support.patch b/debian/patches/12_uuid_support.patch
index 34cee3d..0a60612 100644 (file)
--- a/debian/patches/12_uuid_support.patch
+++ b/debian/patches/12_uuid_support.patch
@@ -12,8 +12,10 @@
 ## DP: * no bootid.txt + ignore_bootid=...                => boots
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:02.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:03.000000000 +0200
 @@ -63,6 +63,11 @@
                                export ACCESS
                                ;;

diff --git a/debian/patches/13_always_display_warnings_and_failures.patch b/debian/patches/13_always_display_warnings_and_failures.patch
index f85217f..31277f5 100644 (file)
--- a/debian/patches/13_always_display_warnings_and_failures.patch
+++ b/debian/patches/13_always_display_warnings_and_failures.patch
@@ -5,8 +5,10 @@
 ## DP: Always display failure and warning messages.
 
 @DPATCH@
---- a/scripts/live-functions
-+++ b/scripts/live-functions
+Index: b/scripts/live-functions
+===================================================================
+--- a/scripts/live-functions   2011-07-24 22:07:56.000000000 +0200
++++ b/scripts/live-functions   2011-07-24 22:08:04.000000000 +0200
 @@ -2,6 +2,17 @@
  . /scripts/functions
  . /live.vars

diff --git a/debian/patches/14_no_blkid_on_lenny.patch b/debian/patches/14_no_blkid_on_lenny.patch
index 75e1c1b..22bc752 100644 (file)
--- a/debian/patches/14_no_blkid_on_lenny.patch
+++ b/debian/patches/14_no_blkid_on_lenny.patch
@@ -8,8 +8,10 @@
 ## DP: /lib/udev/vol_id in /scripts/live as well
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:03.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:06.000000000 +0200
 @@ -1680,7 +1680,12 @@
  
        if is_supported_fs ${fstype}

diff --git a/debian/patches/15_networking_grml.patch b/debian/patches/15_networking_grml.patch
index bb36204..fd257e1 100644 (file)
--- a/debian/patches/15_networking_grml.patch
+++ b/debian/patches/15_networking_grml.patch
@@ -9,8 +9,10 @@
 @DPATCH@
 
 diff a/scripts/live-bottom/23networking_grml b/scripts/live-bottom/23networking_grml
---- /dev/null
-+++ b/scripts/live-bottom/23networking_grml
+Index: b/scripts/live-bottom/23networking_grml
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ b/scripts/live-bottom/23networking_grml    2011-07-24 22:08:07.000000000 +0200
 @@ -0,0 +1,107 @@
 +#!/bin/sh
 +

diff --git a/debian/patches/16_nodhcp.patch b/debian/patches/16_nodhcp.patch
index 45a2e33..2be5a9b 100644 (file)
--- a/debian/patches/16_nodhcp.patch
+++ b/debian/patches/16_nodhcp.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
---- a/scripts/live
-+++ b/scripts/live
+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 @@
  
                        nodhcp)

diff --git a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
index d3717cd..627f709 100644 (file)
--- a/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
+++ b/debian/patches/19_revert_toram_bootoption_to_expected_behaviour.patch
@@ -27,8 +27,10 @@
 @DPATCH@
 
 index d79beed..1b6926e 100755
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:09.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:10.000000000 +0200
 @@ -563,7 +563,7 @@
  
        if [ -z "${MODULETORAM}" ]

diff --git a/debian/patches/25_support_lvm_for_live-media.patch b/debian/patches/25_support_lvm_for_live-media.patch
index d699738..63b6f03 100644 (file)
--- a/debian/patches/25_support_lvm_for_live-media.patch
+++ b/debian/patches/25_support_lvm_for_live-media.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:10.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:11.000000000 +0200
 @@ -1669,6 +1669,29 @@
                        umount $mountpoint
                fi

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index ce1fc47..3df83d7 100644 (file)
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,8 +5,10 @@
 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
 
 @DPATCH@
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:11.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:13.000000000 +0200
 @@ -77,6 +77,18 @@
                                BOOTIF="${x#BOOTIF=}"
                                ;;
@@ -26,8 +28,10 @@
                        debug)
                                DEBUG="Yes"
                                export DEBUG
---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
+Index: b/scripts/live-bottom/23networking_grml
+===================================================================
+--- a/scripts/live-bottom/23networking_grml    2011-07-24 22:08:07.000000000 +0200
++++ b/scripts/live-bottom/23networking_grml    2011-07-24 22:08:13.000000000 +0200
 @@ -44,7 +44,12 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)

diff --git a/debian/patches/27_support_static_ip.patch b/debian/patches/27_support_static_ip.patch
index 03cd679..fb99ba6 100644 (file)
--- a/debian/patches/27_support_static_ip.patch
+++ b/debian/patches/27_support_static_ip.patch
@@ -6,8 +6,10 @@
 
 @DPATCH@
 
---- a/scripts/live
-+++ b/scripts/live
+Index: b/scripts/live
+===================================================================
+--- a/scripts/live     2011-07-24 22:08:13.000000000 +0200
++++ b/scripts/live     2011-07-24 22:08:14.000000000 +0200
 @@ -110,9 +110,8 @@
                                ;;
  

diff --git a/debian/patches/28_remove_localized_manpages.patch b/debian/patches/28_remove_localized_manpages.patch
index 327667c..e261f1b 100644 (file)
--- a/debian/patches/28_remove_localized_manpages.patch
+++ b/debian/patches/28_remove_localized_manpages.patch
@@ -11,8 +11,10 @@ Date:   Wed Jun 8 10:19:29 2011 +0200
     
     So lets drop the localized manpages and just install the english ones.
 
---- a/Makefile
-+++ b/Makefile
+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 @@
                install -D -m 0644 $${MANPAGE} $(DESTDIR)/usr/share/man/man$${SECTION}/$$(basename $${MANPAGE}); \
        done

diff --git a/debian/patches/29_support_dns_in_initramfs.patch b/debian/patches/29_support_dns_in_initramfs.patch
index 856913d..33248d7 100644 (file)
--- a/debian/patches/29_support_dns_in_initramfs.patch
+++ b/debian/patches/29_support_dns_in_initramfs.patch
@@ -6,8 +6,10 @@ Date:   Fri Mar 25 23:02:38 2011 +0100
     
     Thanks to Ulrich Dangel for discovering this. [Closes: issue848]
 
---- a/hooks/live
-+++ b/hooks/live
+Index: b/hooks/live
+===================================================================
+--- a/hooks/live       2011-07-24 22:07:55.000000000 +0200
++++ b/hooks/live       2011-07-24 22:08:17.000000000 +0200
 @@ -258,17 +258,14 @@
        manual_add_modules crc32c
  fi

diff --git a/debian/patches/30_support_multiarch_dns.patch b/debian/patches/30_support_multiarch_dns.patch
index 90d1b66..90bd12b 100644 (file)
--- a/debian/patches/30_support_multiarch_dns.patch
+++ b/debian/patches/30_support_multiarch_dns.patch
@@ -12,8 +12,10 @@ Date:   Tue Jun 7 10:15:52 2011 +0200
     /lib/libnss_dns.so.* but could also be e.g.
     /lib/x86_64-linux-gnu/libnss_dns.so.*.
 
---- a/hooks/live
-+++ b/hooks/live
+Index: b/hooks/live
+===================================================================
+--- a/hooks/live       2011-07-24 22:08:17.000000000 +0200
++++ b/hooks/live       2011-07-24 22:08:18.000000000 +0200
 @@ -260,7 +260,16 @@
  
  # DNS for initramfs

diff --git a/debian/patches/31_package_rename.patch b/debian/patches/31_package_rename.patch
index 04198cf..a83724d 100644 (file)
--- a/debian/patches/31_package_rename.patch
+++ b/debian/patches/31_package_rename.patch
@@ -1,7 +1,7 @@
 Index: b/Makefile
 ===================================================================
---- a/Makefile 2011-07-24 22:58:34.000000000 +0200
-+++ b/Makefile 2011-07-24 22:59:00.000000000 +0200
+--- a/Makefile 2011-07-24 23:49:55.000000000 +0200
++++ b/Makefile 2011-07-24 23:50:20.000000000 +0200
 @@ -52,11 +52,11 @@
        cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
  
@@ -19,11 +19,11 @@ Index: b/Makefile
  
        # Installing manpages
 @@ -85,7 +85,7 @@
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true
  
        # Uninstalling docs
 -      rm -rf $(DESTDIR)/usr/share/doc/live-boot
 +      rm -rf $(DESTDIR)/usr/share/doc/live-boot-grml
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share
-       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/doc || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share || true
+       rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr || true

diff --git a/debian/rules b/debian/rules
index d2e4e99..710e6fa 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,19 +10,22 @@ build:
        dh ${@} --with quilt
 
 override_dh_auto_install:
-       dh_auto_install -- DESTDIR=debian/live-boot-grml
+       dh_auto_install -- DESTDIR=debian/tmp
 
        # Removing useless files
-       rm -f debian/live-boot-grml/usr/share/doc/live-boot-grml/COPYING
+       rm -f debian/tmp/usr/share/doc/live-boot-grml/COPYING
+       # Some more useless files
+       rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/12fstab
+       rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/23networking
+       rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/24preseed
+       rm -f debian/tmp/usr/share/initramfs-tools/scripts/live-bottom/30accessibility
 
        # live-boot-initramfs-tools
        mkdir -p debian/live-boot-grml-initramfs-tools/usr/share
-       mv debian/live-boot-grml/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share
-       # Some more useless files
-       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/12fstab
-       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/23networking
-       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/24preseed
-       rm -f debian/live-boot-grml-initramfs-tools/usr/share/initramfs-tools/scripts/live-bottom/30accessibility
+       mv debian/tmp/usr/share/initramfs-tools debian/live-boot-grml-initramfs-tools/usr/share
 
 override_dh_installinit:
        dh_installinit -p live-boot-grml --no-restart-on-upgrade --no-start --update-rcd-params='start 89 0 6 .'
+
+override_dh_install:
+       dh_install --fail-missing

diff --git a/manpages/Makefile b/manpages/Makefile
index 444468a..00370bc 100644 (file)
--- a/manpages/Makefile
+++ b/manpages/Makefile
@@ -25,7 +25,7 @@ build: po4a.cfg
                echo "E: po4a - command not found"; \
                echo "I: po4a can be optained from:"; \
                echo "I:   http://po4a.alioth.debian.org/"; \
-               echo "I: On Debian systems, po4a can be installed with:"; \
+               echo "I: On Debian based systems, po4a can be installed with:"; \
                echo "I:   apt-get install po4a"; \
                exit 1; \
        fi

diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7
index b462e99..e8ec318 100644 (file)
--- a/manpages/de/live-boot.de.7
+++ b/manpages/de/live-boot.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 7 2011\-05\-18 3.0~a17 "Debian Live Projekt"
+.TH LIVE\-BOOT 7 13.07.2011 3.0~a19 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-boot\fP \- System Boot Skripte

diff --git a/manpages/de/live-snapshot.de.1 b/manpages/de/live-snapshot.de.1
index cfe6968..2752275 100644 (file)
--- a/manpages/de/live-snapshot.de.1
+++ b/manpages/de/live-snapshot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-BOOT 1 2011\-05\-18 3.0~a17 "Debian Live Projekt"
+.TH LIVE\-BOOT 1 13.07.2011 3.0~a19 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-snapshot\fP \- simple script to ease persistence usage

diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7
index c353617..4fd5b09 100644 (file)
--- a/manpages/en/live-boot.7
+++ b/manpages/en/live-boot.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 7 2011\-05\-18 3.0~a17 "Debian Live Project"
+.TH LIVE\-BOOT 7 2011\-07\-13 3.0~a19 "Debian Live Project"
 
 .SH NAME
 \fBlive\-boot\fR \- System Boot Scripts

diff --git a/manpages/en/live-snapshot.1 b/manpages/en/live-snapshot.1
index 2cbaa14..953c383 100644 (file)
--- a/manpages/en/live-snapshot.1
+++ b/manpages/en/live-snapshot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BOOT 1 2011\-05\-18 3.0~a17 "Debian Live Project"
+.TH LIVE\-BOOT 1 2011\-07\-13 3.0~a19 "Debian Live Project"
 
 .SH NAME
 \fBlive\-snapshot\fR \- simple script to ease persistence usage

diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po
index 9f6b6d7..2d6e827 100644 (file)
--- a/manpages/po/de/live-boot.7.po
+++ b/manpages/po/de/live-boot.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a17\n"
-"POT-Creation-Date: 2011-05-18 19:30+0300\n"
+"Project-Id-Version: live-boot 3.0~a19\n"
+"POT-Creation-Date: 2011-07-13 10:28+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-05-18"
-msgstr ""
+msgid "2011-07-13"
+msgstr "13.07.2011"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a17"
-msgstr "3.0~a17"
+msgid "3.0~a19"
+msgstr "3.0~a19"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1

diff --git a/manpages/po/de/live-snapshot.1.po b/manpages/po/de/live-snapshot.1.po
index b4fc00b..909a46a 100644 (file)
--- a/manpages/po/de/live-snapshot.1.po
+++ b/manpages/po/de/live-snapshot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-boot 3.0~a17\n"
-"POT-Creation-Date: 2011-05-18 19:30+0300\n"
+"Project-Id-Version: live-boot 3.0~a19\n"
+"POT-Creation-Date: 2011-07-13 10:28+0300\n"
 "PO-Revision-Date: 2010-05-24 12:34+0300\n"
 "Last-Translator: Daniel Baumann <daniel@debian.org>\n"
 "Language-Team: none\n"
@@ -24,14 +24,14 @@ msgstr "LIVE-BOOT"
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-05-18"
-msgstr ""
+msgid "2011-07-13"
+msgstr "13.07.2011"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a17"
-msgstr "3.0~a17"
+msgid "3.0~a19"
+msgstr "3.0~a19"
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1

diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot
index 10ead51..f5177bb 100644 (file)
--- a/manpages/pot/live-boot.7.pot
+++ b/manpages/pot/live-boot.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2011-05-18 19:30+0300\n"
+"POT-Creation-Date: 2011-07-13 10:28+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-05-18"
+msgid "2011-07-13"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a17"
+msgid "3.0~a19"
 msgstr ""
 
 #. type: TH

diff --git a/manpages/pot/live-snapshot.1.pot b/manpages/pot/live-snapshot.1.pot
index f88aa15..96ea0b6 100644 (file)
--- a/manpages/pot/live-snapshot.1.pot
+++ b/manpages/pot/live-snapshot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-boot VERSION\n"
-"POT-Creation-Date: 2011-05-18 19:30+0300\n"
+"POT-Creation-Date: 2011-07-13 10:28+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,13 +25,13 @@ msgstr ""
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "2011-05-18"
+msgid "2011-07-13"
 msgstr ""
 
 #. type: TH
 #: en/live-boot.7:1 en/live-snapshot.1:1
 #, no-wrap
-msgid "3.0~a17"
+msgid "3.0~a19"
 msgstr ""
 
 #. type: TH

diff --git a/scripts/live b/scripts/live
index 57a4d32..23d0bbc 100755 (executable)
--- a/scripts/live
+++ b/scripts/live
@@ -1476,8 +1476,8 @@ setup_unionfs ()
                                unionmountopts="${unionmountopts} ${unionrw}=RW:${unionro}=RO"
                                ( sysctl -w fs.file-max=391524 ; ulimit -HSn 16384
                                unionfs-fuse ${unionmountopts} "${unionmountpoint}" ) && \
-                                       ( mkdir -p /run/initramfs
-                               pidof unionfs-fuse >> /run/initramfs/sendsigs.omit || true )
+                               ( mkdir -p /run/sendsigs.omit.d
+                               pidof unionfs-fuse >> /run/sendsigs.omit.d/unionfs-fuse || true )
                                ;;
 
                        unionmount)