[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 735596ce0208d010fe286fef6b5e74a48032374b

[git.ipfire.org] IPFire 2.x development tree branch, thirteen, updated. 735596ce0208d010fe286fef6b5e74a48032374b

[git]

[-- Attachment #1: Type: text/plain, Size: 4765 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, thirteen has been updated
       via  735596ce0208d010fe286fef6b5e74a48032374b (commit)
       via  212cab4f9d7d4ebad0c45020f36ee145cc9be709 (commit)
      from  bbfb087e7d9537a0332b2cccc8678581043e277a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 735596ce0208d010fe286fef6b5e74a48032374b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Nov 1 17:08:24 2012 +0100

    installer: hide udev messages after boot.

commit 212cab4f9d7d4ebad0c45020f36ee145cc9be709
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Nov 1 13:24:47 2012 +0100

    installer: add target drive details security question.

-----------------------------------------------------------------------

Summary of changes:
 lfs/initrd                             |    3 +++
 src/install+setup/install/main.c       |    9 ++++++++-
 src/install+setup/install/mountdest.sh |   21 +++++++++++++++------
 3 files changed, 26 insertions(+), 7 deletions(-)

Difference in files:
diff --git a/lfs/initrd b/lfs/initrd
index fe221e8..7403644 100644
--- a/lfs/initrd
+++ b/lfs/initrd
@@ -71,6 +71,9 @@ $(TARGET) :
 
 	cd /install/initrd/ && patch -Np0 < $(DIR_SRC)/src/patches/dracut-init_start_ipfireinstaller.patch
 
+	# Hide udev messages
+	sed -i -e "s|err|none|g" /install/initrd/etc/udev/udev.conf
+
 	# make new dependencies 
 	depmod -a -F /boot/System.map-$(KVER)-ipfire $(KVER)-ipfire
 
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 9513a7f..6a50044 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 	char **langtrs[] = { de_tr, en_tr, fr_tr, es_tr, pl_tr, ru_tr, NULL };
 	char hdletter;
 	char harddrive[30], sourcedrive[5];	/* Device holder. */
+	char harddrive_info[STRING_SIZE];	/* Additional infos about target */
 	struct devparams hdparams, cdromparams; /* Params for CDROM and HD */
 	int rc = 0;
 	char commandstring[STRING_SIZE];
@@ -213,6 +214,12 @@ int main(int argc, char *argv[])
 	}
 	fgets(harddrive, 30, handle);
 	fclose(handle);
+	if ((handle = fopen("/tmp/dest_device_info", "r")) == NULL) {
+		sprintf(harddrive_info, "%s", harddrive);
+	}
+	fgets(harddrive_info, 70, handle);
+	fclose(handle);
+
 			
 	/* load unattended configuration */
 	if (unattended) {
@@ -236,7 +243,7 @@ int main(int argc, char *argv[])
 
 	fprintf(flog, "Destination drive: %s\n", hdparams.devnode_disk);
 	
-	sprintf(message, ctr[TR_PREPARE_HARDDISK], hdparams.devnode_disk);
+	sprintf(message, ctr[TR_PREPARE_HARDDISK], harddrive_info);
 	if (unattended) {
 	    hardyn = 1;
 	} else {
diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh
index ccee691..068659c 100644
--- a/src/install+setup/install/mountdest.sh
+++ b/src/install+setup/install/mountdest.sh
@@ -79,18 +79,18 @@ for path in /sys/block/*; do
 	esac
 
 	# Replace any exclamation marks (e.g. cciss!c0d0).
-	device=${device//!/\/}
+	device_=${device//!/\/}
 
 	# Guess if this could be a raid device.
-	for dev in ${device} ${device}p1; do
+	for dev in ${device_} ${device_}p1; do
 		if [ -e "/dev/${dev}" ]; then
 			device=${dev}
 			break
 		fi
 	done
 
-	echo "Checking ${device}"
-	if check_source_drive ${device}; then
+	echo "Checking ${device_}"
+	if check_source_drive ${device_}; then
 		echo "  is source drive - skipping"
 		continue
 	fi
@@ -102,13 +102,22 @@ for path in /sys/block/*; do
 
 	# Found it.
 	echo "  OK, this is it..."
-	echo -n "${device}" > /tmp/dest_device
+	echo -n "${device_}" > /tmp/dest_device
+
+	# Build string with drive details
+	echo -n "/dev/${device_} (" > /tmp/dest_device_info
+	# size is in sectors (512 Bytes)
+	let DISK_SIZE=$(cat /sys/block/${device}/size)/2097152
+	echo -n "$DISK_SIZE GB - " >> /tmp/dest_device_info
+	echo -n "$(cat /sys/block/${device}/device/vendor) " >> /tmp/dest_device_info
+	echo -n "$(cat /sys/block/${device}/device/model) " >> /tmp/dest_device_info
+	echo -n "$(cat /sys/block/${device}/device/rev))" >> /tmp/dest_device_info
 
 	# Exit code table:
 	#  1: sda
 	#  2: RAID
 	# 10: nothing found
-	case "${device}" in
+	case "${device_}" in
 		*p1|*c0d0)
 			exit 2
 			;;


hooks/post-receive
--
IPFire 2.x development tree