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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 4891 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  dc270128f02afa19da53567a2b7dcd3b6ac12bb4 (commit)
       via  a254047d2d15a40d2500f3d91f49671cdbb498e5 (commit)
       via  59209622e3e65ad407afc58f9dcd14e19287c11d (commit)
       via  1566fb6b5531247bd60d291716da1d5a017e9dce (commit)
      from  c2c246b67c28fb872e80677531222bc07f9b26f6 (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 dc270128f02afa19da53567a2b7dcd3b6ac12bb4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 3 15:16:15 2014 +0200

    installer: remove error outputs at devicesearch.

commit a254047d2d15a40d2500f3d91f49671cdbb498e5
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 3 15:12:34 2014 +0200

    installer: change modulename iso9660 -> isofs;

commit 59209622e3e65ad407afc58f9dcd14e19287c11d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 3 15:08:54 2014 +0200

    backupiso: set version to 2.15.

commit 1566fb6b5531247bd60d291716da1d5a017e9dce
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat May 3 15:05:20 2014 +0200

    sshd: add fallback for oom setings with old kernel.

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

Summary of changes:
 config/rootfiles/core/77/filelists/files | 1 +
 src/initscripts/init.d/sshd              | 5 ++++-
 src/install+setup/install/main.c         | 4 ++--
 src/install+setup/install/mountsource.sh | 2 +-
 src/scripts/backupiso                    | 4 ++--
 5 files changed, 10 insertions(+), 6 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/77/filelists/files b/config/rootfiles/core/77/filelists/files
index fcb88ad..dd35042 100644
--- a/config/rootfiles/core/77/filelists/files
+++ b/config/rootfiles/core/77/filelists/files
@@ -20,6 +20,7 @@ srv/web/ipfire/html/themes/ipfire
 srv/web/ipfire/html/themes/ipfire-legacy
 srv/web/ipfire/html/themes/maniac
 usr/lib/firewall
+usr/local/bin/backupiso
 usr/local/bin/timezone-transition
 usr/local/bin/setddns.pl
 usr/sbin/updxlrator
diff --git a/src/initscripts/init.d/sshd b/src/initscripts/init.d/sshd
index 0ed8661..1d61a63 100644
--- a/src/initscripts/init.d/sshd
+++ b/src/initscripts/init.d/sshd
@@ -43,7 +43,10 @@ case "$1" in
 	(
 		sleep 3
 		pid=$(cat /var/run/sshd.pid 2>/dev/null)
-		[ -n "${pid}" ] && echo "-16" > "/proc/${pid}/oom_score_adj"
+		[ -n "${pid}" ] && [ -e "/proc/${pid}/oom_score_adj" ] && \
+					echo "-16" > "/proc/${pid}/oom_score_adj" || \
+				[ -e "/proc/${pid}/oom_adj" ] && \
+					echo "-16" > "/proc/${pid}/oom_adj"
 	) &
         ;;
 
diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index b503c8b..9dd39ca 100644
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -124,8 +124,8 @@ int main(int argc, char *argv[])
 	}
 
 	// Load common modules
-	mysystem("/sbin/modprobe iso9660"); // CDROM
-//	mysystem("/sbin/modprobe ext2"); // Boot patition
+	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 267823a..2e6a669 100644
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -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\///");do
+	for DEVICEP in $(ls /dev/${DEVICE}p? | sed "s/\/dev\///" 2> /dev/null);do
 		mount /dev/${DEVICEP} /cdrom 2> /dev/null
 		if [ -n "$(ls /cdrom/${version}.media 2>/dev/null)" ]; then
 			echo -n ${DEVICEP} > /tmp/source_device
diff --git a/src/scripts/backupiso b/src/scripts/backupiso
index 30616a4..dab1d6d 100644
--- a/src/scripts/backupiso
+++ b/src/scripts/backupiso
@@ -2,8 +2,8 @@
 
 COREVER=$(cat /opt/pakfire/db/core/mine)
 # FIXME: edit this lines before release
-URL="http://download.ipfire.org/releases/ipfire-2.x/2.13-core$COREVER/"
-ISO="ipfire-2.13.i586-full-core$COREVER.iso"
+URL="http://download.ipfire.org/releases/ipfire-2.x/2.15-core$COREVER/"
+ISO="ipfire-2.15.i586-full-core$COREVER.iso"
 
 if [ -z $1 ]; then
 	echo usage: $0 backup-file


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