From: Christian Hofstaedtler Date: Sun, 24 Jul 2011 19:57:36 +0000 (+0200) Subject: Merge remote-tracking branch 'debian/debian' into ch/new_version X-Git-Tag: v3.0_a19-1+grml.00~1^2~1 X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=8cd0e7a9e961e73abe47b0d5c11d3c3a9cbdf802;hp=ec72422e74e8e863cf8962ef1fe530180ed21afa Merge remote-tracking branch 'debian/debian' into ch/new_version Conflicts: Makefile debian/changelog debian/control debian/rules --- diff --git a/Makefile b/Makefile index c62aabd..ed2471f 100644 --- 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-grml @@ -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-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 # Uninstalling manpages for MANPAGE in manpages/en/*; \ diff --git a/VERSION b/VERSION index 31cfe14..9ae56c3 100644 --- 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 --- 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 . # -# 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: " + echo "Homepage: " exit 0 } diff --git a/debian/changelog b/debian/changelog index b4bffb0..997b433 100644 --- 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 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 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 --- 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 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 --- 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 index 0000000..79474ce --- /dev/null +++ b/debian/live-boot-grml.install @@ -0,0 +1,2 @@ +sbin +usr/share/live-boot diff --git a/debian/rules b/debian/rules index d2e4e99..710e6fa 100755 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 --- 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 \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 --- 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 \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 --- 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 \n" "Language-Team: LANGUAGE \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 --- 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 \n" "Language-Team: LANGUAGE \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 --- 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)