[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 921023a33c6c0dfed6b876396513c659e6dbf979

[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 921023a33c6c0dfed6b876396513c659e6dbf979

[git]

[-- Attachment #1: Type: text/plain, Size: 6493 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, master has been updated
       via  921023a33c6c0dfed6b876396513c659e6dbf979 (commit)
       via  9de3c7f611de2b3ba1aa7bee70621632159b091b (commit)
      from  dc270128f02afa19da53567a2b7dcd3b6ac12bb4 (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 921023a33c6c0dfed6b876396513c659e6dbf979
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 4 11:07:05 2014 +0200

    xen-downloader: update script.
    
    -new legacy kernel package.
    -add console variable.
    -fix file permissions.

commit 9de3c7f611de2b3ba1aa7bee70621632159b091b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 4 11:06:20 2014 +0200

    installer: make it silence 2nd try.

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

Summary of changes:
 config/xen-image/xen-image-maker.sh      | 19 ++++++++++---------
 src/install+setup/install/main.c         |  2 --
 src/install+setup/install/mountsource.sh |  6 +++---
 3 files changed, 13 insertions(+), 14 deletions(-)

Difference in files:
diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh
index c080450..a42ad5b 100644
--- a/config/xen-image/xen-image-maker.sh
+++ b/config/xen-image/xen-image-maker.sh
@@ -27,15 +27,16 @@ KERN_TYPE=pae
 KVER=xxxKVERxxx
 KERN_PACK=xxxKERN_PACKxxx
 KRNDOWN=http://mirror0.ipfire.org/pakfire2/$VERSION/paks
-
+CONSOLE=hvc0
 ###############################################################################
 # If you really want to use  outdated legacy kernel uncomment this lines. #####
 # Not recommended!!! ##########################################################
 ######################
 #KERN_TYPE=xen
 #KVER=2.6.32.61
-#KERN_PACK=28
+#KERN_PACK=29
 #KRNDOWN=http://mirror0.ipfire.org/pakfire2/2.15/paks
+#CONSOLE=xvc0
 ###############################################################################
 
 SIZEboot=64
@@ -108,10 +109,10 @@ mount -o loop $IMGvar $MNThdd/var
 
 # Install IPFire without kernel modules
 tar -C $MNThdd/ -xvf $ISODIR/$SNAME-$VERSION.tlz --lzma \
-	--exclude=lib/modules* --exclude=boot*
+	--exclude=lib/modules* --exclude=boot* --numeric-owner
 
 #Install Kernel
-tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL
+tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner
 chroot $MNThdd /opt/pakfire/tmp/install.sh
 rm -rf $MNThdd/opt/pakfire/tmp/*
 
@@ -120,7 +121,7 @@ mkdir $MNThdd/boot/grub
 echo "timeout 10"                          > $MNThdd/boot/grub/grub.conf
 echo "default 0"                          >> $MNThdd/boot/grub/grub.conf
 echo "title IPFire ($KERN_TYPE-kernel)"   >> $MNThdd/boot/grub/grub.conf
-echo "  kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=xvc0 ro" \
+echo "  kernel /vmlinuz-$KVER-ipfire-xen root=/dev/xvda3 rootdelay=10 panic=10 console=$CONSOLE ro" \
 					  >> $MNThdd/boot/grub/grub.conf
 echo "  initrd /ipfirerd-$KVER-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf
 echo "# savedefault 0" >> $MNThdd/boot/grub/grub.conf
@@ -161,12 +162,12 @@ rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S19checkfstab
 #Remove console init
 rm -rf $MNThdd/etc/rc.d/rcsysinit.d/S70console
 
-#Add xvc0 to securetty
-echo xvc0 >> $MNThdd/etc/securetty
+#Add console to securetty
+echo $CONSOLE >> $MNThdd/etc/securetty
 
-#Add getty for xvc0
+#Add getty for console
 echo "#Enable login for XEN" >> $MNThdd/etc/inittab
-echo "8:2345:respawn:/sbin/agetty xvc0 9600 --noclear" >> $MNThdd/etc/inittab
+echo "8:2345:respawn:/sbin/agetty $CONSOLE 9600 --noclear" >> $MNThdd/etc/inittab
 
 #Disable some initskripts
 echo "#!/bin/sh" > $MNThdd/etc/rc.d/init.d/setclock
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index 9dd39ca..e61f94d 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -124,8 +124,6 @@ int main(int argc, char *argv[])
 	}
 
 	// Load common modules
-	mysystem("/sbin/modprobe isofs"); // CDROM
-	mysystem("/sbin/modprobe ext4"); // Boot patition
 	mysystem("/sbin/modprobe vfat"); // USB key
 	
 	/* German is the default */
diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index 2e6a669..c335020 100644
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2013  IPFire Team  <info(a)ipfire.org>                     #
+# Copyright (C) 2007-2014  IPFire Team  <info(a)ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -42,7 +42,7 @@ done
 # scan all Partitions on block devices
 for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
 do
-	for DEVICEP in $(ls /dev/${DEVICE}? | sed "s/\/dev\///" 2> /dev/null);do
+	for DEVICEP in $(ls /dev/${DEVICE}? 2>/dev/null | sed "s/\/dev\///");do
 		mount /dev/${DEVICEP} /cdrom 2> /dev/null
 		if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
 			echo -n ${DEVICEP} > /tmp/source_device
@@ -58,7 +58,7 @@ done
 # scan all Partitions on raid/mmc devices
 for DEVICE in `find /sys/block/* -maxdepth 0 ! -name fd* ! -name loop* ! -name ram* -exec basename {} \;`
 do
-	for DEVICEP in $(ls /dev/${DEVICE}p? | sed "s/\/dev\///" 2> /dev/null);do
+	for DEVICEP in $(ls /dev/${DEVICE}p? 2>/dev/null | sed "s/\/dev\///");do
 		mount /dev/${DEVICEP} /cdrom 2> /dev/null
 		if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
 			echo -n ${DEVICEP} > /tmp/source_device


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