sablink/overlay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

sys-kernel/genkernel: add wrapper arround the creation of chroot dev entries onyl when required

Browse Source 
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2624 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one 2010-10-30 07:36:58 +00:00
parent 3f0071324a
commit 8227bdda72
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys-kernel/genkernel/ChangeLog
View File

@ -2,6 +2,11 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $ # $Header: $
30 Oct 2010; Mario Fetka <mario.fetka@gmail.com>
+files/3.4.11/genkernel-3.4.10.907-mdev_chroot_dev-1.patch,
-files/3.4.11/genkernel-3.4.10.907-mdev_dev-1.patch:
add wrapper arround the creation of chroot dev entries onyl when required
30 Oct 2010; Mario Fetka <mario.fetka@gmail.com> 30 Oct 2010; Mario Fetka <mario.fetka@gmail.com>
files/3.4.11/genkernel-3.4.10.907-mdev_dev-1.patch: files/3.4.11/genkernel-3.4.10.907-mdev_dev-1.patch:
add nashack boot option add nashack boot option

4
sys-kernel/genkernel/Manifest
View File

@ -1,6 +1,6 @@
AUX 3.4.11/0001-use-mdadm-instead-of-bundled-stripped-down-mdassembl.patch 5450 RMD160 03c674f453a3256181db93346856ae05fec3c52c SHA1 acf12ec07e152bd367c511a2d01747b6d2bb0f00 SHA256 3b32865584756e053be14358286de9246621e14b6c135e2fc03e2d99279bb7be AUX 3.4.11/0001-use-mdadm-instead-of-bundled-stripped-down-mdassembl.patch 5450 RMD160 03c674f453a3256181db93346856ae05fec3c52c SHA1 acf12ec07e152bd367c511a2d01747b6d2bb0f00 SHA256 3b32865584756e053be14358286de9246621e14b6c135e2fc03e2d99279bb7be
AUX 3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch 38833 RMD160 5dda7e0d16a0c6d238f0bb8622c96816f7751d81 SHA1 d21aa64341c53d59381bfb442260c8195e6f32ca SHA256 dd947c6fa94274a30723b1a085431e4e01adff30b1616aa2766ae4a5f07ddca5 AUX 3.4.11/genkernel-3.4.10.907-busybox-1.17.3.patch 38833 RMD160 5dda7e0d16a0c6d238f0bb8622c96816f7751d81 SHA1 d21aa64341c53d59381bfb442260c8195e6f32ca SHA256 dd947c6fa94274a30723b1a085431e4e01adff30b1616aa2766ae4a5f07ddca5
AUX 3.4.11/genkernel-3.4.10.907-mdev_dev-1.patch 3224 RMD160 1cab8599916c0687a5b92e1289ca00abccfd2c03 SHA1 bc766546daa551fb87796f5b95fc26cd42018196 SHA256 4139a676e4044682e487b673e1576d51c5405b0d16c79f148855900f2f4c97e3 AUX 3.4.11/genkernel-3.4.10.907-mdev_chroot_dev-1.patch 3294 RMD160 390f14c7de83840fdfc3c642ebae6ef57c1b773f SHA1 272017a0d7b18e2d64e3a40b46a8070d754fb04e SHA256 34240e5e6c5f516d99b1f10689243c7f7d10c88574b3b6f7253d59cfcfcbc32b
AUX 3.4.11/genkernel-3.4.11-aufs-slowusb.patch 3425 RMD160 74add9c16143240da14ad307a25d5cccba58e893 SHA1 ffeee71f9e2146e0533591e62c0b3d1e0f77efd7 SHA256 8a131caf94253c0799daa18e0146b13b96f0667552ad6f97ce246c13f403a900 AUX 3.4.11/genkernel-3.4.11-aufs-slowusb.patch 3425 RMD160 74add9c16143240da14ad307a25d5cccba58e893 SHA1 ffeee71f9e2146e0533591e62c0b3d1e0f77efd7 SHA256 8a131caf94253c0799daa18e0146b13b96f0667552ad6f97ce246c13f403a900
AUX 3.4.11/genkernel-3.4.11-branding.patch 3273 RMD160 8234e9da1ee6e4f89074b3a97a8508db07a6be01 SHA1 f7fa1b8b07aa334b54e96a510756d6f82954ed90 SHA256 d9a9907c5bd316ee7384f4dcb3f2d80775b5aed1fb6b40763bce8543ecee86a2 AUX 3.4.11/genkernel-3.4.11-branding.patch 3273 RMD160 8234e9da1ee6e4f89074b3a97a8508db07a6be01 SHA1 f7fa1b8b07aa334b54e96a510756d6f82954ed90 SHA256 d9a9907c5bd316ee7384f4dcb3f2d80775b5aed1fb6b40763bce8543ecee86a2
AUX 3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch 291 RMD160 06cea814b7f1a44bda3a46bb5939ebc5649be485 SHA1 eb65b70222e3063379d71d3e2091ffb8b6b2cbc6 SHA256 c4f83688c1bec65bd7082d93be0e014163c9ecf0c9f5a0d36ec1ed5645bfca2b AUX 3.4.11/genkernel-3.4.11-btrfs-partial-support-bug-303529.patch 291 RMD160 06cea814b7f1a44bda3a46bb5939ebc5649be485 SHA1 eb65b70222e3063379d71d3e2091ffb8b6b2cbc6 SHA256 c4f83688c1bec65bd7082d93be0e014163c9ecf0c9f5a0d36ec1ed5645bfca2b
@ -18,5 +18,5 @@ DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad
DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb DIST open-iscsi-2.0-871.tar.gz 330514 RMD160 f996d9145bc3727394f1a4999f430bd5ea5c2a0d SHA1 968baf16d4094fb9842bc04b0fe8109103356252 SHA256 bcea8746ae82f2ada7bc05d2aa59bcda1ca0d5197f05f2e16744aae59f0a7dcb
DIST unionfs-fuse-0.24.tar.bz2 30381 RMD160 27934c23472f6e9d71e622f13aa9fd51a1f8018e SHA1 26f281e4e5f1e82194b430956b94cd7745d5bd97 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937 DIST unionfs-fuse-0.24.tar.bz2 30381 RMD160 27934c23472f6e9d71e622f13aa9fd51a1f8018e SHA1 26f281e4e5f1e82194b430956b94cd7745d5bd97 SHA256 d8abc855eb618ac356b1e716599c82f8f0f74dbaee36d4062edc707567121937
EBUILD genkernel-3.4.10.907-r13.ebuild 4985 RMD160 1a90d8144c12e8f67cb04502d8e3b24aa5200c08 SHA1 d4694c5355c462501f1334f1fcade0dcfccaa3f3 SHA256 37a17572d4846cd69c2d2d224d91917452b362e41c79e7275e9f545d0a8ab41d EBUILD genkernel-3.4.10.907-r13.ebuild 4985 RMD160 1a90d8144c12e8f67cb04502d8e3b24aa5200c08 SHA1 d4694c5355c462501f1334f1fcade0dcfccaa3f3 SHA256 37a17572d4846cd69c2d2d224d91917452b362e41c79e7275e9f545d0a8ab41d
MISC ChangeLog 1527 RMD160 9072ba3110091777834438748450c7bb7b2ffb22 SHA1 af4162229948cbe137eca5a3e8fdd4d99f0db5bb SHA256 4b860957c3165a7ea57f3069602d3d610a69887ea3c99b19d938f0ac7fe41ca6 MISC ChangeLog 1772 RMD160 0704681c276ef3a573c39deeac05f6c1313f5586 SHA1 f93969157d3c554acde19c522355dcbf52e27829 SHA256 e4afa9b39bb116fa0d56ef644c7b435ba5e624943df07901025527394468312f
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5

19
sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-mdev_dev-1.patch → sys-kernel/genkernel/files/3.4.11/genkernel-3.4.10.907-mdev_chroot_dev-1.patch
View File

@ -3,7 +3,7 @@ Date: 2010-10-30
Initial Package Version: 3.4.10.907 Initial Package Version: 3.4.10.907
Origin: gentoo busybox mdev-start.sh and me Origin: gentoo busybox mdev-start.sh and me
Upstream Status: unknown Upstream Status: unknown
Description: create a new nashack boot option to work around real root is missing some dev entries Description: add a new boot command 'nashack' that creates the missing dev entries
diff -Naur genkernel-3.4.10.907.orig/defaults/initrd.scripts genkernel-3.4.10.907/defaults/initrd.scripts diff -Naur genkernel-3.4.10.907.orig/defaults/initrd.scripts genkernel-3.4.10.907/defaults/initrd.scripts
--- genkernel-3.4.10.907.orig/defaults/initrd.scripts 2010-10-29 16:11:03.765695917 +0000 --- genkernel-3.4.10.907.orig/defaults/initrd.scripts 2010-10-29 16:11:03.765695917 +0000
@ -77,28 +77,31 @@ diff -Naur genkernel-3.4.10.907.orig/defaults/initrd.scripts genkernel-3.4.10.90
+ +
diff -Naur genkernel-3.4.10.907.orig/defaults/linuxrc genkernel-3.4.10.907/defaults/linuxrc diff -Naur genkernel-3.4.10.907.orig/defaults/linuxrc genkernel-3.4.10.907/defaults/linuxrc
--- genkernel-3.4.10.907.orig/defaults/linuxrc 2010-10-29 16:11:03.762695924 +0000 --- genkernel-3.4.10.907.orig/defaults/linuxrc 2010-10-29 16:11:03.762695924 +0000
+++ genkernel-3.4.10.907/defaults/linuxrc 2010-10-30 05:20:08.366956721 +0000 +++ genkernel-3.4.10.907/defaults/linuxrc 2010-10-30 07:31:00.700222780 +0000
@@ -62,6 +62,10 @@ @@ -62,6 +62,10 @@
init_opts\=*) init_opts\=*)
INIT_OPTS=`parse_opt "${x}"` INIT_OPTS=`parse_opt "${x}"`
;; ;;
+ # remount chroot rw and create missing dev entries in real_root + # remount chroot rw and create missing files
+ nashack) + nashack)
+ NASHACK=1 + NASHACK=1
+ ;; + ;;
# Livecd options # Livecd options
cdroot) cdroot)
CDROOT=1 CDROOT=1
@@ -731,6 +735,14 @@ @@ -731,6 +735,17 @@
verbose_kmsg verbose_kmsg
+# create the missing dev entrys for the nas boxes +# create the missing dev entrys for the nas boxes if the don't exist
+if [ "${NASHACK}" = '1' ] +if [ "${NASHACK}" = '1' ]
+then +then
+ mount -o remount,rw ${CHROOT} >/dev/null 2>&1 + if [ ! -e "${CHROOT}/dev/console" ] || [ ! -e "${CHROOT}/dev/null" ]
+ seed_chroot_dev + then
+ mount -o remount,ro ${CHROOT} >/dev/null 2>&1 + mount -o remount,rw ${CHROOT} >/dev/null 2>&1
+ seed_chroot_dev
+ mount -o remount,ro ${CHROOT} >/dev/null 2>&1
+ fi
+fi +fi
+ +
echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}" echo -ne "${GOOD}>>${NORMAL}${BOLD} Booting (initramfs)${NORMAL}"