r2741 - in people/daniel/installer-initramfs: . bin hooks
daniel at alioth.debian.org
daniel at alioth.debian.org
Sat Aug 11 17:33:25 UTC 2007
Author: daniel
Date: 2007-08-11 17:33:25 +0000 (Sat, 11 Aug 2007)
New Revision: 2741
Added:
people/daniel/installer-initramfs/bin/installer-preseed
people/daniel/installer-initramfs/bin/installer-reconfigure
Removed:
people/daniel/installer-initramfs/bin/live-preseed
people/daniel/installer-initramfs/bin/live-reconfigure
Modified:
people/daniel/installer-initramfs/Makefile
people/daniel/installer-initramfs/hooks/installer
Log:
Modified: people/daniel/installer-initramfs/Makefile
===================================================================
--- people/daniel/installer-initramfs/Makefile 2007-08-11 17:29:04 UTC (rev 2740)
+++ people/daniel/installer-initramfs/Makefile 2007-08-11 17:33:25 UTC (rev 2741)
@@ -15,15 +15,15 @@
install: test build
# Installing executables
- mkdir -p $(DESTDIR)/usr/share/live-initramfs
- cp bin/live-preseed bin/live-reconfigure $(DESTDIR)/usr/share/live-initramfs
+ mkdir -p $(DESTDIR)/usr/share/installer-initramfs
+ cp bin/installer-preseed bin/installer-reconfigure $(DESTDIR)/usr/share/installer-initramfs
mkdir -p $(DESTDIR)/usr/share/initramfs-tools
cp -r hooks scripts $(DESTDIR)/usr/share/initramfs-tools
# Installing documentation
- mkdir -p $(DESTDIR)/usr/share/doc/live-initramfs
- cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/live-initramfs
+ mkdir -p $(DESTDIR)/usr/share/doc/installer-initramfs
+ cp -r COPYING docs/* $(DESTDIR)/usr/share/doc/installer-initramfs
# Installing manpages
set -e; for MANPAGE in manpages/*.en.7; \
@@ -41,13 +41,13 @@
uninstall:
# Uninstalling executables
- rm -rf $(DESTDIR)/usr/share/live-initramfs
- rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/live
+ rm -rf $(DESTDIR)/usr/share/installer-initramfs
+ rm -f $(DESTDIR)/usr/share/initramfs-tools/hooks/installer
rm -rf $(DESTDIR)/usr/share/initramfs-tools/scripts/live*
rm -f $(DESTDIR)/usr/share/initramfs-tools/scripts/local-top/live
# Uninstalling documentation
- rm -rf $(DESTDIR)/usr/share/doc/live-initramfs
+ rm -rf $(DESTDIR)/usr/share/doc/installer-initramfs
# Uninstalling manpages
set -e; for MANPAGE in manpages/*.en.7; \
Copied: people/daniel/installer-initramfs/bin/installer-preseed (from rev 2733, people/daniel/installer-initramfs/bin/live-preseed)
===================================================================
--- people/daniel/installer-initramfs/bin/installer-preseed (rev 0)
+++ people/daniel/installer-initramfs/bin/installer-preseed 2007-08-11 17:33:25 UTC (rev 2741)
@@ -0,0 +1,19 @@
+#! /bin/sh
+set -e
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+
+root="$1"
+question="$2"
+value="$3"
+seen="$4"
+[ "$seen" ] || seen=true
+
+if ! (echo "SET $question $value"; echo "FSET $question seen $seen") | chroot "$1" debconf-communicate -fnoninteractive live-initramfs >/dev/null; then
+ chroot "$1" debconf-communicate -fnoninteractive live-initramfs >/dev/null <<EOF
+REGISTER debian-installer/dummy $question
+SET $question $value
+FSET $question seen $seen
+EOF
+fi
+
+exit 0
Copied: people/daniel/installer-initramfs/bin/installer-reconfigure (from rev 2733, people/daniel/installer-initramfs/bin/live-reconfigure)
===================================================================
--- people/daniel/installer-initramfs/bin/installer-reconfigure (rev 0)
+++ people/daniel/installer-initramfs/bin/installer-reconfigure 2007-08-11 17:33:25 UTC (rev 2741)
@@ -0,0 +1,52 @@
+#! /bin/sh
+
+set -e
+export PATH=/usr/bin:/usr/sbin:/sbin:/bin
+
+frontend=noninteractive
+
+findcommandinroot() {
+ ROOT="$1/"
+ shift
+ while [ "$#" -ge 1 ]; do
+ P="$PATH"
+ while [ "$P" ]; do
+ D=${P%%:*}
+ P=${P#*:}
+ if [ "$D" = "$P" ]; then
+ P=
+ fi
+ if [ -z "$D" ]; then
+ D=.
+ fi
+ if [ -x "$ROOT$D/$1" ]; then
+ echo "$D/$1"
+ return 0
+ fi
+ done
+ shift
+ done
+ return 1
+}
+
+runcommandinroot() {
+ C=$(findcommandinroot "$1" "$2")
+ ROOT="$1"
+ shift
+ shift
+ [ -n "$C" ] && chroot "$ROOT" "$C" "$@"
+}
+
+root="$1"
+package="$2"
+
+version=$(runcommandinroot "$root" dpkg-query -W --showformat='${Version}' "$package" 2>/dev/null) || version=""
+
+if [ -z "$version" ]; then
+ echo >&2 "$0: package '$package' is not installed"
+ exit 0
+fi
+
+runcommandinroot "$root" dpkg-reconfigure -fnoninteractive --no-reload "$package"
+
+exit 0
Deleted: people/daniel/installer-initramfs/bin/live-preseed
===================================================================
--- people/daniel/installer-initramfs/bin/live-preseed 2007-08-11 17:29:04 UTC (rev 2740)
+++ people/daniel/installer-initramfs/bin/live-preseed 2007-08-11 17:33:25 UTC (rev 2741)
@@ -1,19 +0,0 @@
-#! /bin/sh
-set -e
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-
-root="$1"
-question="$2"
-value="$3"
-seen="$4"
-[ "$seen" ] || seen=true
-
-if ! (echo "SET $question $value"; echo "FSET $question seen $seen") | chroot "$1" debconf-communicate -fnoninteractive live-initramfs >/dev/null; then
- chroot "$1" debconf-communicate -fnoninteractive live-initramfs >/dev/null <<EOF
-REGISTER debian-installer/dummy $question
-SET $question $value
-FSET $question seen $seen
-EOF
-fi
-
-exit 0
Deleted: people/daniel/installer-initramfs/bin/live-reconfigure
===================================================================
--- people/daniel/installer-initramfs/bin/live-reconfigure 2007-08-11 17:29:04 UTC (rev 2740)
+++ people/daniel/installer-initramfs/bin/live-reconfigure 2007-08-11 17:33:25 UTC (rev 2741)
@@ -1,52 +0,0 @@
-#! /bin/sh
-
-set -e
-export PATH=/usr/bin:/usr/sbin:/sbin:/bin
-
-frontend=noninteractive
-
-findcommandinroot() {
- ROOT="$1/"
- shift
- while [ "$#" -ge 1 ]; do
- P="$PATH"
- while [ "$P" ]; do
- D=${P%%:*}
- P=${P#*:}
- if [ "$D" = "$P" ]; then
- P=
- fi
- if [ -z "$D" ]; then
- D=.
- fi
- if [ -x "$ROOT$D/$1" ]; then
- echo "$D/$1"
- return 0
- fi
- done
- shift
- done
- return 1
-}
-
-runcommandinroot() {
- C=$(findcommandinroot "$1" "$2")
- ROOT="$1"
- shift
- shift
- [ -n "$C" ] && chroot "$ROOT" "$C" "$@"
-}
-
-root="$1"
-package="$2"
-
-version=$(runcommandinroot "$root" dpkg-query -W --showformat='${Version}' "$package" 2>/dev/null) || version=""
-
-if [ -z "$version" ]; then
- echo >&2 "$0: package '$package' is not installed"
- exit 0
-fi
-
-runcommandinroot "$root" dpkg-reconfigure -fnoninteractive --no-reload "$package"
-
-exit 0
Modified: people/daniel/installer-initramfs/hooks/installer
===================================================================
--- people/daniel/installer-initramfs/hooks/installer 2007-08-11 17:29:04 UTC (rev 2740)
+++ people/daniel/installer-initramfs/hooks/installer 2007-08-11 17:33:25 UTC (rev 2741)
@@ -27,8 +27,8 @@
# Handling installer-initramfs
# Executables
-copy_exec /usr/share/installer-initramfs/live-reconfigure /bin
-copy_exec /usr/share/installer-initramfs/live-preseed /bin
+copy_exec /usr/share/installer-initramfs/installer-reconfigure /bin
+copy_exec /usr/share/installer-initramfs/installer-preseed /bin
# Scripts
cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
More information about the debian-live-changes
mailing list