--- a/debian/changelog Thu Mar 29 15:01:03 2007 +0200
+++ b/debian/changelog Sat Mar 31 23:19:43 2007 +0200
@@ -1,3 +1,13 @@ grml2hd (0.9.13) unstable; urgency=low
+grml2hd (0.9.14) unstable; urgency=low
+
+ * Update code for removing of grml-sysvinit as we don't need
+ grml-sysvinit anymore.
+ * Do not prompt for bootmanager if using SW-RAID as we don't
+ support grub yet.
+ * Provide 'Quit'-button in welcome screen. [Closes: issue192]
+
+ -- Michael Prokop <mika@grml.org> Sat, 31 Mar 2007 23:08:33 +0200
+
grml2hd (0.9.13) unstable; urgency=low
* Support 'Linux raid autodetect' within check4partition as well.
--- a/grml2hd Thu Mar 29 15:01:03 2007 +0200
+++ b/grml2hd Sat Mar 31 23:19:43 2007 +0200
@@ -4,7 +4,7 @@
# Authors: grml-team (grml.org), (c) Andreas Gredler <jimmy@grml.org>, Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Don Mär 29 12:12:49 CEST 2007 [mika]
+# Latest change: Sam Mär 31 23:18:59 CEST 2007 [mika]
################################################################################
LANG='C'
@@ -49,7 +49,7 @@ image=/boot/memtest86+.bin
"
# variables
-VERSION='0.9.13'
+VERSION='0.9.14'
PN=$(basename "$0")
PID="$(echo $$)"
UNAME=$(uname -r)
@@ -266,11 +266,11 @@ Exiting..." 11 60
fdisk -l 2>/dev/null | grep $PARTITION | grep -qe 'Linux$' -qe 'Linux LVM$' -qe 'Linux raid autodetect$'
if [ $? != 0 ]; then
dialog --title "${PN}" --msgbox "Error: $PARTITION does not seem to be a Linux, LVM or RAID partition.
-
+
Installing grml on a partition type other than Linux or LVM might cause serious problems.
-
+
Please use a programm like cfdisk to set the according partition type of ${PARTITION} and restart grml2hd.
-
+
Exiting..." 11 60
bailout 7
fi
@@ -731,7 +731,8 @@ fi
fi
welcome_screen() {
- is_grml2hd_noninteractive || ( dialog --stdout --msgbox "Welcome to ${PN} ${VERSION}!
+ if ! is_grml2hd_noninteractive ; then
+ dialog --yes-label Continue --no-label Quit --yesno "Welcome to ${PN} ${VERSION}!
${PN} can install grml to your harddisk.
@@ -752,7 +753,16 @@ subscribe to the grml-user mailinglist (
Please give us feedback to improve the installer!
http://grml.org/contact/ contact (at) grml.org
-" 0 0 )
+" 0 0
+
+ retval=$?
+ case $retval in
+ (0) # everything ok
+ ;;
+ (1) echo "Cancel pressed." ; bailout 1 ;;
+ (255) echo "ESC pressed." ; bailout 255 ;;
+ esac
+ fi
}
grmlsmall_fixes() {
--- a/grml2hd-chrooted Thu Mar 29 15:01:03 2007 +0200
+++ b/grml2hd-chrooted Sat Mar 31 23:19:43 2007 +0200
@@ -429,7 +429,8 @@ Error:
bootmanager_selection() {
# in non-interactive mode we use lilo by default, unless $BOOT_MANAGER is set to grub
- if is_grml2hd_noninteractive ; then
+ # our grub code within grml2hd does not support SWRAID yet, so use lilo
+ if is_grml2hd_noninteractive -o -n "$SWRAID" ; then
if [ "$BOOT_MANAGER" = "grub" ] ; then
export USE_GRUB='1'
else
@@ -453,8 +454,11 @@ bootmanager_selection() {
}
fix_sysvinit() {
- dpkg --purge grml-sysvinit 1>/dev/null 2>&1
- cp /sbin/init /etc 1>/dev/null 2>&1
+ # purge grml-sysvinit only if it's present:
+ if dpkg --list grml-sysvinit | grep -q '^ii' ; then
+ dpkg --purge grml-sysvinit 1>/dev/null 2>&1
+ cp /sbin/init /etc 1>/dev/null 2>&1
+ fi
if [ -n "$GRML_SMALL" ] ; then
cp /etc/runlevel.conf.hdinstall.small /etc/runlevel.conf
else