[Pkg-ganeti-devel] [instance-debootstrap] 11/13: Drop debian hooks (merged upstream)

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos pushed a commit to branch master
in repository instance-debootstrap.

commit 9561150c3b3aab70272983b90c5376da3a5c3526
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Fri Feb 21 13:11:46 2014 +0200

    Drop debian hooks (merged upstream)
    
    Since version 0.12, g-i-d correctly activates the console on xen
    instances.
    
    Since version 0.14, the root password is cleared by default.
    
    Also, use dpkg-maintscript-helper to remove the hooks from installed
    systems if appropriate.
---
 debian/hooks/clear-root-password | 21 ---------------------
 debian/hooks/xen-hvc0            | 24 ------------------------
 debian/install                   |  1 -
 debian/maintscript               |  2 ++
 4 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/debian/hooks/clear-root-password b/debian/hooks/clear-root-password
deleted file mode 100755
index 417b62d..0000000
--- a/debian/hooks/clear-root-password
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Make sure we're not working on the root directory
-if [ -z "$TARGET" -o "$TARGET" = "/" ]; then
-    echo "Invalid target directory '$TARGET', aborting." 1>&2
-    exit 1
-fi
-
-if [ "$(mountpoint -d /)" = "$(mountpoint -d "$TARGET")" ]; then
-    echo "The target directory seems to be the root dir, aborting."  1>&2
-    exit 1
-fi
-
-# Disable root's password, as the switch to enable shadow by default
-# has left root with a disabled password, preventing the initial login
-echo "Disabling root's password"
-chroot "$TARGET" passwd -d root
-
-exit 0
diff --git a/debian/hooks/xen-hvc0 b/debian/hooks/xen-hvc0
deleted file mode 100755
index 5210767..0000000
--- a/debian/hooks/xen-hvc0
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Make sure we're not working on the root directory
-if [ -z "$TARGET" -o "$TARGET" = "/" ]; then
-    echo "Invalid target directory '$TARGET', aborting." 1>&2
-    exit 1
-fi
-
-if [ "$(mountpoint -d /)" = "$(mountpoint -d "$TARGET")" ]; then
-    echo "The target directory seems to be the root dir, aborting."  1>&2
-    exit 1
-fi
-
-# Fix the console information for xen-pvm mode
-if [ "$HYPERVISOR" = "xen-pvm" ]; then
-    echo "xen-pvm hypervisor detected, adding getty on hvc0"
-    cat >> "$TARGET"/etc/inittab <<EOF
-hvc0:2345:respawn:/sbin/getty 38400 hvc0
-EOF
-fi
-
-exit 0
diff --git a/debian/install b/debian/install
deleted file mode 100644
index 0f4cbb0..0000000
--- a/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-debian/hooks/* etc/ganeti/instance-debootstrap/hooks/
diff --git a/debian/maintscript b/debian/maintscript
new file mode 100644
index 0000000..0e774ff
--- /dev/null
+++ b/debian/maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/ganeti/instance-debootstrap/hooks/xen-hvc0 0.14-1~
+rm_conffile /etc/ganeti/instance-debootstrap/hooks/clear-root-password 0.14-1~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/instance-debootstrap.git