From c5a45496b9c72e41333e213979d43fbcff34da9f Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Tue, 16 Sep 2008 14:51:30 +0200 Subject: initramfs-tools: Add support for linux-2.6 make deb-pkg target it generates linux images that look into this directories for maintainer script action. make sure to generate an intramfs and also to remove it. --- kernel/postinst.d/update-initramfs | 7 +++++++ kernel/postrm.d/update-initramfs | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100755 kernel/postinst.d/update-initramfs create mode 100755 kernel/postrm.d/update-initramfs (limited to 'kernel') diff --git a/kernel/postinst.d/update-initramfs b/kernel/postinst.d/update-initramfs new file mode 100755 index 0000000..2d3b391 --- /dev/null +++ b/kernel/postinst.d/update-initramfs @@ -0,0 +1,7 @@ +#!/bin/sh +# + +[ -z "$1" ] && exit 0 + +# create initramfs - update runs do_bootloader +update-initramfs -t -u -k "$1" diff --git a/kernel/postrm.d/update-initramfs b/kernel/postrm.d/update-initramfs new file mode 100755 index 0000000..432d672 --- /dev/null +++ b/kernel/postrm.d/update-initramfs @@ -0,0 +1,7 @@ +#!/bin/sh +# + +[ -z "$1" ] && exit 0 + +# delete initramfs +update-initramfs -d -k "$1" -- cgit v1.2.3 From 04356cfcee60b2ff3a57a6942c2cebfdb088d04c Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Wed, 17 Sep 2008 15:36:16 +0200 Subject: Revert "initramfs-tools: Add support for linux-2.6 make deb-pkg target" This reverts commit c5a45496b9c72e41333e213979d43fbcff34da9f. hinders removal of other package linux-image postinst call also the /etc/kernel structure, thus delete needs a takeover and this is postlenny material. thanks Vincent Danjean for report. (closes: #499270) --- debian/initramfs-tools.install | 1 - debian/rules | 2 +- kernel/postinst.d/update-initramfs | 7 ------- kernel/postrm.d/update-initramfs | 7 ------- 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100755 kernel/postinst.d/update-initramfs delete mode 100755 kernel/postrm.d/update-initramfs (limited to 'kernel') diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install index 71670ef..fb1c088 100644 --- a/debian/initramfs-tools.install +++ b/debian/initramfs-tools.install @@ -10,4 +10,3 @@ conf/modules usr/share/initramfs-tools update-initramfs usr/sbin debian/script usr/share/bug/initramfs-tools debian/lintian/initramfs-tools usr/share/lintian/overrides -kernel etc diff --git a/debian/rules b/debian/rules index 1376aa9..2a5ae55 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk pre-build:: chmod +x init mkinitramfs chmod +x hooks/* - for x in `find scripts/ kernel/ -maxdepth 1 -type d | tail -n+2`; do \ + for x in `find scripts/ -maxdepth 1 -type d | tail -n+2`; do \ chmod -R +x $$x; \ done diff --git a/kernel/postinst.d/update-initramfs b/kernel/postinst.d/update-initramfs deleted file mode 100755 index 2d3b391..0000000 --- a/kernel/postinst.d/update-initramfs +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# - -[ -z "$1" ] && exit 0 - -# create initramfs - update runs do_bootloader -update-initramfs -t -u -k "$1" diff --git a/kernel/postrm.d/update-initramfs b/kernel/postrm.d/update-initramfs deleted file mode 100755 index 432d672..0000000 --- a/kernel/postrm.d/update-initramfs +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# - -[ -z "$1" ] && exit 0 - -# delete initramfs -update-initramfs -d -k "$1" -- cgit v1.2.3 From 7812c98ccaf731b0d76909f924639af4e9554ed3 Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Tue, 14 Oct 2008 15:02:17 -0400 Subject: initramfs-tools: Readd support for linux-2.6 make deb-pkg target. ..via /etc/kernel Signed-off-by: Andres Salomon (closes: #504551) [ fixed update-initramfs postinst call s/-u/-c/ -maks ] Signed-off-by: maximilian attems --- debian/initramfs-tools.install | 1 + debian/rules | 2 +- kernel/postinst.d/initramfs-tools | 10 ++++++++++ kernel/postrm.d/initramfs-tools | 10 ++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 kernel/postinst.d/initramfs-tools create mode 100755 kernel/postrm.d/initramfs-tools (limited to 'kernel') diff --git a/debian/initramfs-tools.install b/debian/initramfs-tools.install index fb1c088..71670ef 100644 --- a/debian/initramfs-tools.install +++ b/debian/initramfs-tools.install @@ -10,3 +10,4 @@ conf/modules usr/share/initramfs-tools update-initramfs usr/sbin debian/script usr/share/bug/initramfs-tools debian/lintian/initramfs-tools usr/share/lintian/overrides +kernel etc diff --git a/debian/rules b/debian/rules index 2a5ae55..1376aa9 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk pre-build:: chmod +x init mkinitramfs chmod +x hooks/* - for x in `find scripts/ -maxdepth 1 -type d | tail -n+2`; do \ + for x in `find scripts/ kernel/ -maxdepth 1 -type d | tail -n+2`; do \ chmod -R +x $$x; \ done diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools new file mode 100755 index 0000000..1cb72a8 --- /dev/null +++ b/kernel/postinst.d/initramfs-tools @@ -0,0 +1,10 @@ +#!/bin/sh + +# passing the kernel version is required +[ -z "$1" ] && exit 0 + +# kernel-package passes an extra arg; hack to not run under kernel-package +[ -z "$2" ] || exit 0 + +# we're good - create initramfs. update runs do_bootloader +update-initramfs -c -t -k "$1" diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools new file mode 100755 index 0000000..278a6fc --- /dev/null +++ b/kernel/postrm.d/initramfs-tools @@ -0,0 +1,10 @@ +#!/bin/sh + +# passing the kernel version is required +[ -z "$1" ] && exit 0 + +# kernel-package passes an extra arg; hack to not run under kernel-package +[ -z "$2" ] || exit 0 + +# delete initramfs +update-initramfs -d -k "$1" -- cgit v1.2.3 From 072ad3179c526b90b57719e127de851182b04c4c Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Fri, 25 Sep 2009 02:34:14 +0200 Subject: /etc/kernel hook script support newer kernel-package k-p no longer generates initramfs by itself, so do it for it. (closes: #523735) --- kernel/postinst.d/initramfs-tools | 25 +++++++++++++++++++++---- kernel/postrm.d/initramfs-tools | 25 +++++++++++++++++++++---- 2 files changed, 42 insertions(+), 8 deletions(-) (limited to 'kernel') diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index 1cb72a8..b389921 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -1,10 +1,27 @@ #!/bin/sh +version="$1" +bootopt="" + # passing the kernel version is required -[ -z "$1" ] && exit 0 +[ -z "${version}" ] && exit 0 + +# kernel-package passes an extra arg +if [ -n "$2" ]; then + if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then + ${bootdir}= $(dirname "$2") + bootopt="-b ${bootdir}" + else + exit 0 + fi +fi -# kernel-package passes an extra arg; hack to not run under kernel-package -[ -z "$2" ] || exit 0 +if [ -n "$DEB_MAINT_PARAMS" ]; then + eval set -- "$DEB_MAINT_PARAMS" + if [ -z "$1" ] || [ "$1" != "configure" ]; then + exit 0 + fi +fi # we're good - create initramfs. update runs do_bootloader -update-initramfs -c -t -k "$1" +update-initramfs -c -t -k "${version}" ${bootopt} diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 278a6fc..88c6d07 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -1,10 +1,27 @@ #!/bin/sh +version="$1" +bootopt="" + # passing the kernel version is required -[ -z "$1" ] && exit 0 +[ -z "${version}" ] && exit 0 + +# kernel-package passes an extra arg +if [ -n "$2" ]; then + if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then + ${bootdir}= $(dirname "$2") + bootopt="-b ${bootdir}" + else + exit 0 + fi +fi -# kernel-package passes an extra arg; hack to not run under kernel-package -[ -z "$2" ] || exit 0 +if [ -n "$DEB_MAINT_PARAMS" ]; then + eval set -- "$DEB_MAINT_PARAMS" + if [ -z "$1" ] || [ "$1" != "remove" ]; then + exit 0 + fi +fi # delete initramfs -update-initramfs -d -k "$1" +update-initramfs -d -k "${version}" ${bootopt} -- cgit v1.2.3 From 02cb277c7eb1e40d926b95aef3419ee5c929f0f6 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Fri, 25 Sep 2009 19:48:48 +0200 Subject: /etc/kernel/postrm.d/i-t: use now takeover on delete makes the script idempotent (closes: #547365) Reported-by: Jonathan Nieder Signed-off-by: maximilian attems --- kernel/postrm.d/initramfs-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 88c6d07..359a226 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -24,4 +24,4 @@ if [ -n "$DEB_MAINT_PARAMS" ]; then fi # delete initramfs -update-initramfs -d -k "${version}" ${bootopt} +update-initramfs -d -t -k "${version}" ${bootopt} -- cgit v1.2.3 From 339235ef8fc662c5ac29a4906680cf839f0fb711 Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Thu, 1 Oct 2009 00:01:18 +0200 Subject: kernel hook scripts: Fix typo /etc/kernel/postrm.d/initramfs-tools: line 12: =: command not found It says: ${bootdir}= $(dirname "$2") which should be: bootdir=$(dirname "$2") Tested-by: Matthijs Kooijman Signed-off-by: maximilian attems --- kernel/postinst.d/initramfs-tools | 2 +- kernel/postrm.d/initramfs-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel') diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index b389921..b4b286d 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -9,7 +9,7 @@ bootopt="" # kernel-package passes an extra arg if [ -n "$2" ]; then if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then - ${bootdir}= $(dirname "$2") + bootdir=$(dirname "$2") bootopt="-b ${bootdir}" else exit 0 diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 359a226..269650a 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -9,7 +9,7 @@ bootopt="" # kernel-package passes an extra arg if [ -n "$2" ]; then if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then - ${bootdir}= $(dirname "$2") + bootdir=$(dirname "$2") bootopt="-b ${bootdir}" else exit 0 -- cgit v1.2.3 From 3158f6513227b63efd672505592ab537e043212c Mon Sep 17 00:00:00 2001 From: maximilian attems Date: Thu, 1 Oct 2009 00:06:08 +0200 Subject: kernel hook scripts: add comments try to make the intention of the code more clear Reported-by: Matthijs Kooijman Signed-off-by: maximilian attems --- kernel/postinst.d/initramfs-tools | 2 ++ kernel/postrm.d/initramfs-tools | 2 ++ 2 files changed, 4 insertions(+) (limited to 'kernel') diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index b4b286d..68124f7 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -12,10 +12,12 @@ if [ -n "$2" ]; then bootdir=$(dirname "$2") bootopt="-b ${bootdir}" else + # official Debian linux-images take care themself exit 0 fi fi +# avoid running multiple times if [ -n "$DEB_MAINT_PARAMS" ]; then eval set -- "$DEB_MAINT_PARAMS" if [ -z "$1" ] || [ "$1" != "configure" ]; then diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 269650a..7811589 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -12,10 +12,12 @@ if [ -n "$2" ]; then bootdir=$(dirname "$2") bootopt="-b ${bootdir}" else + # official linux-images take care themself exit 0 fi fi +# avoid running multiple times if [ -n "$DEB_MAINT_PARAMS" ]; then eval set -- "$DEB_MAINT_PARAMS" if [ -z "$1" ] || [ "$1" != "remove" ]; then -- cgit v1.2.3 From 09d251adb669002cbfcd5fd330e1c6471f6fc644 Mon Sep 17 00:00:00 2001 From: Stephen Powell Date: Fri, 2 Jul 2010 08:03:16 +0200 Subject: postinst hook: respect INITRD variable Do not create an initial RAM file system image for a custom kernel created by make-kpkg if one was not requested by the --initrd flag of make-kpkg. Signed-off-by: maximilian attems --- kernel/postinst.d/initramfs-tools | 2 ++ 1 file changed, 2 insertions(+) (limited to 'kernel') diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index 68124f7..5005ca4 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -9,6 +9,8 @@ bootopt="" # kernel-package passes an extra arg if [ -n "$2" ]; then if [ -n "${KERNEL_PACKAGE_VERSION}" ]; then + # exit if custom kernel does not need an initramfs + [ "$INITRD" = 'No' ] && exit 0 bootdir=$(dirname "$2") bootopt="-b ${bootdir}" else -- cgit v1.2.3 From ff6116f97b557fd337993a8cc87403021e581325 Mon Sep 17 00:00:00 2001 From: Stephen Powell Date: Fri, 2 Jul 2010 08:05:28 +0200 Subject: Redirect STDOUT to STDERR for post{inst,rm} hooks Avoids output being swallowed by debconf's redirection of STDOUT. Signed-off-by: maximilian attems --- kernel/postinst.d/initramfs-tools | 2 +- kernel/postrm.d/initramfs-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel') diff --git a/kernel/postinst.d/initramfs-tools b/kernel/postinst.d/initramfs-tools index 5005ca4..d4db23d 100755 --- a/kernel/postinst.d/initramfs-tools +++ b/kernel/postinst.d/initramfs-tools @@ -28,4 +28,4 @@ if [ -n "$DEB_MAINT_PARAMS" ]; then fi # we're good - create initramfs. update runs do_bootloader -update-initramfs -c -t -k "${version}" ${bootopt} +update-initramfs -c -t -k "${version}" ${bootopt} >&2 diff --git a/kernel/postrm.d/initramfs-tools b/kernel/postrm.d/initramfs-tools index 7811589..4e8f73b 100755 --- a/kernel/postrm.d/initramfs-tools +++ b/kernel/postrm.d/initramfs-tools @@ -26,4 +26,4 @@ if [ -n "$DEB_MAINT_PARAMS" ]; then fi # delete initramfs -update-initramfs -d -t -k "${version}" ${bootopt} +update-initramfs -d -t -k "${version}" ${bootopt} >&2 -- cgit v1.2.3