denes
/
genkernel_fork
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into plymouth

Browse Source 
Conflicts:
	arch/x86/modules_load
	arch/x86_64/modules_load
	defaults/modules_load
cleanup-cruft
Fabio Erculiani 12 years ago
parent 7505a99952 f8b1ea1186
commit 08cd7890bf
11 changed files with 86 additions and 132 deletions
Show Stats Download Patch File Download Diff File

4
.gitignore vendored
Unescape View File

@ -1,3 +1 @@
/genkernel.8 /*.tar.*
/genkernel-*.tar.bz2
/ChangeLog

23
Makefile
Unescape View File

@ -1,16 +1,13 @@
PACKAGE_VERSION = `/bin/fgrep GK_V= genkernel | sed "s/.*GK_V='\([^']\+\)'/\1/"` VERSION ?=
distdir = genkernel-$(PACKAGE_VERSION) distdir = genkernel-next-$(VERSION)
# Add off-Git/generated files here that need to be shipped with releases # Add off-Git/generated files here that need to be shipped with releases
EXTRA_DIST = genkernel.8 ChangeLog EXTRA_DIST = genkernel.8
genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel genkernel.8: doc/genkernel.8.txt doc/asciidoc.conf Makefile genkernel
a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(PACKAGE_VERSION)" \ a2x --conf-file=doc/asciidoc.conf --attribute="genkernelversion=$(VERSION)" \
--format=manpage -D . "$<" --format=manpage -D . "$<"
ChangeLog:
git log >$@
clean: clean:
rm -f $(EXTRA_DIST) rm -f $(EXTRA_DIST)
@ -19,12 +16,10 @@ check-git-repository:
git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; } git diff --cached --quiet || { echo 'STOP, you have uncommitted changes in the index' ; false ; }
dist: check-git-repository $(EXTRA_DIST) dist: check-git-repository $(EXTRA_DIST)
rm -Rf "$(distdir)" "$(distdir)".tar "$(distdir)".tar.bz2 test -n "$(VERSION)" || { echo "VERSION not set" >&2; exit 1; }
mkdir "$(distdir)" git archive --prefix=$(distdir)/ --format=tar "v$(VERSION)" > $(distdir).tar
git ls-files -z | xargs -0 cp --no-dereference --parents --target-directory="$(distdir)" \ rm -f $(distdir).tar.xz
$(EXTRA_DIST) xz $(distdir).tar
tar cf "$(distdir)".tar "$(distdir)" scp $(distdir).tar.xz lxnay@dev.gentoo.org:~/public_html/genkernel-next/
bzip2 -9v "$(distdir)".tar
rm -Rf "$(distdir)"
.PHONY: clean check-git-repository dist .PHONY: clean check-git-repository dist

7
arch/x86/modules_load
Unescape View File

@ -28,7 +28,12 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
# Crypto # Crypto
MODULES_CRYPTO="sha256_generic cbc aes_generic aes_586 aesni-intel xts" MODULES_CRYPTO="sha1_generic sha256_generic sha512_generic cbc aes_generic aes-x86_64 xts"
# Backward compatibility with previous releases
MODULES_CRYPT="${MODULES_CRYPTO}"
# Virtio support (KVM mainly)
MODULES_VIRTIO="virtio virtio_balloon virtio_console virtio_net virtio_blk virtio_pci virtio_ring"
# DRM (Plymouth support) # DRM (Plymouth support)
MODULES_PLYMOUTH="uvesafb" MODULES_PLYMOUTH="uvesafb"

7
arch/x86_64/modules_load
Unescape View File

@ -28,7 +28,12 @@ MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd x
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
# Crypto # Crypto
MODULES_CRYPTO="sha256_generic cbc aes_generic aes-x86_64 aesni-intel xts" MODULES_CRYPTO="sha1_generic sha256_generic sha512_generic cbc aes_generic aes-x86_64 xts"
# Backward compatibility with previous releases
MODULES_CRYPT="${MODULES_CRYPTO}"
# Virtio support (KVM mainly)
MODULES_VIRTIO="virtio virtio_balloon virtio_console virtio_net virtio_blk virtio_pci virtio_ring"
# DRM (Plymouth support) # DRM (Plymouth support)
MODULES_PLYMOUTH="uvesafb" MODULES_PLYMOUTH="uvesafb"

4
defaults/initrd.defaults
Unescape View File

@ -77,5 +77,5 @@ DEFAULT_NFSOPTIONS="ro,nolock,rsize=1024,wsize=1024"
# Only sections that are in by default or those that # Only sections that are in by default or those that
# are not module groups need to be defined here... # are not module groups need to be defined here...
HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid mdadm fs net' HWOPTS='keymap cache modules pata sata scsi usb firewire waitscan lvm dmraid mdadm fs net virtio'
MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto plymouth' MY_HWOPTS='modules pata sata scsi usb firewire waitscan dmraid mdadm fs net iscsi crypto plymouth virtio'

86
defaults/initrd.scripts
Unescape View File

@ -1,4 +1,4 @@
#!/bin/ash #!/bin/sh
. /etc/initrd.defaults . /etc/initrd.defaults
@ -169,7 +169,7 @@ findmediamount() {
# $2 = recognition file # $2 = recognition file
# $3 = variable to have the device path # $3 = variable to have the device path
# $4 = actual mount dir path (full path) # $4 = actual mount dir path (full path)
# args remaining are possible devices # args remaining are possible devices
local media=$1 recon=$2 vrbl=$3 mntdir=$4 local media=$1 recon=$2 vrbl=$3 mntdir=$4
shift 4 shift 4
@ -196,14 +196,14 @@ findmediamount() {
if [ -b "${x}" ] if [ -b "${x}" ]
then then
skip=0 skip=0
bsn=`basename "${x}"` bsn=$(basename "${x}")
# #
# If disk and it has at least one partition, skip. # If disk and it has at least one partition, skip.
# We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we # We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we
# don't skip device mapper devices. Even the craziest scenario # don't skip device mapper devices. Even the craziest scenario
# deserves a fair chance. # deserves a fair chance.
# #
for part in `ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null` for part in $(ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null)
do do
skip=1 skip=1
break; break;
@ -282,7 +282,7 @@ bootstrapCD() {
bootstrapKey() { bootstrapKey() {
# $1 = ROOT/SWAP # $1 = ROOT/SWAP
local KEYDEVS=`devicelist` local KEYDEVS=$(devicelist)
eval local keyloc='"${CRYPT_'${1}'_KEY}"' eval local keyloc='"${CRYPT_'${1}'_KEY}"'
findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "/mnt/key" ${KEYDEVS} findmediamount "key" "${keyloc}" "CRYPT_${1}_KEYDEV" "/mnt/key" ${KEYDEVS}
@ -328,27 +328,26 @@ mount_sysfs() {
findnfsmount() { findnfsmount() {
if [ "${IP}" != '' ] || busybox udhcpc -n -T 15 -q if [ "${IP}" != '' ] || busybox udhcpc -n -T 15 -q
then then
[ -e /rootpath ] && NFSROOT=`cat /rootpath` [ -e /rootpath ] && NFSROOT=$(cat /rootpath)
if [ "${NFSROOT}" = '' ] if [ "${NFSROOT}" = '' ]
then then
# Obtain NFSIP # Obtain NFSIP
OPTIONS=`busybox dmesg | grep rootserver | sed -e "s/,/ /g"` OPTIONS=$(busybox dmesg | grep rootserver | sed -e "s/,/ /g")
for OPTION in $OPTIONS for OPTION in $OPTIONS
do do
if [ `echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 1` = 'rootserver' ] if [ $(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 1) = 'rootserver' ]
then then
NFSIP=`echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2` NFSIP=$(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2)
fi fi
done done
# Obtain NFSPATH # Obtain NFSPATH
OPTIONS=`busybox dmesg | grep rootpath | sed -e "s/,/ /g"` OPTIONS=$(busybox dmesg | grep rootpath | sed -e "s/,/ /g")
for OPTION in $OPTIONS for OPTION in $OPTIONS
do do
if [ `echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 1` = 'rootpath' ] if [ $(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 1) = 'rootpath' ]
then then
NFSPATH=`echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2` NFSPATH=$(echo $OPTION | sed -e "s/=/ /g" | cut -d " " -f 2)
fi fi
done done
@ -383,7 +382,7 @@ findnfsmount() {
else else
bad_msg "NFS Mounting failed. Is the path corrent ?" bad_msg "NFS Mounting failed. Is the path corrent ?"
fi fi
else else
good_msg "Attempting to mount NFS root on ${NFSROOT} with options ${NFSOPTIONS}" good_msg "Attempting to mount NFS root on ${NFSROOT} with options ${NFSOPTIONS}"
mount -t nfs -o ${NFSOPTIONS} ${NFSROOT} ${NEW_ROOT} mount -t nfs -o ${NFSOPTIONS} ${NFSROOT} ${NEW_ROOT}
if [ "$?" = '0' ] if [ "$?" = '0' ]
@ -408,17 +407,17 @@ find_real_device() {
local retval=1 local retval=1
if [ "${retval}" -ne 0 ]; then if [ "${retval}" -ne 0 ]; then
REAL_DEVICE=`findfs "${DEVICE}" 2>/dev/null` REAL_DEVICE=$(findfs "${DEVICE}" 2>/dev/null)
retval=$? retval=$?
fi fi
if [ "$retval" -ne 0 ]; then if [ "$retval" -ne 0 ]; then
REAL_DEVICE=`busybox findfs "${DEVICE}" 2>/dev/null` REAL_DEVICE=$(busybox findfs "${DEVICE}" 2>/dev/null)
retval=$? retval=$?
fi fi
if [ "${retval}" -ne 0 ]; then if [ "${retval}" -ne 0 ]; then
REAL_DEVICE=`blkid -o device -l -t "${DEVICE}"` REAL_DEVICE=$(blkid -o device -l -t "${DEVICE}")
retval=$? retval=$?
fi fi
@ -433,11 +432,9 @@ find_real_device() {
check_loop() { check_loop() {
if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ] if [ "${LOOP}" = '' -o ! -e "${CDROOT_PATH}/${LOOP}" ]
then then
bad_msg "Invalid loop location: ${LOOP}" bad_msg "Invalid loop location: ${LOOP}"
bad_msg 'Please export LOOP with a valid location, or reboot and pass a proper loop=...' bad_msg 'Please export LOOP with a valid location, or reboot and pass a proper loop=...'
bad_msg 'kernel command line!' bad_msg 'kernel command line!'
run_shell run_shell
fi fi
} }
@ -487,7 +484,7 @@ mount_devfs () {
test_success() { test_success() {
retcode=$? retcode=$?
# If last command failed send error message and fall back to a shell # If last command failed send error message and fall back to a shell
if [ "$retcode" != '0' ] if [ "$retcode" != '0' ]
then then
error_string=$1 error_string=$1
@ -518,7 +515,7 @@ bad_msg() {
splashcmd verbose splashcmd verbose
echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}" echo -e "${BAD}!!${NORMAL}${BOLD} ${msg_string} ${NORMAL}"
fi fi
} }
warn_msg() { warn_msg() {
msg_string=$1 msg_string=$1
@ -645,7 +642,7 @@ prompt_user(){
bad_msg '- type "q" to skip...' bad_msg '- type "q" to skip...'
echo -n "${2}(${oldvalue}) :: " echo -n "${2}(${oldvalue}) :: "
read ${1} read ${1}
case `eval echo '$'${1}` in case $(eval echo '$'${1}) in
'q') 'q')
eval ${1}'='${oldvalue} eval ${1}'='${oldvalue}
warn_msg "Skipping step, this will likely cause a boot failure." warn_msg "Skipping step, this will likely cause a boot failure."
@ -677,7 +674,7 @@ cmdline_hwopts() {
MY_HWOPTS="${MY_HWOPTS} $x" MY_HWOPTS="${MY_HWOPTS} $x"
elif [ "${y}" = "no${x}" ] elif [ "${y}" = "no${x}" ]
then then
MY_HWOPTS="`echo ${MY_HWOPTS} | sed -e \"s/${x}//g\" -`" MY_HWOPTS="$(echo ${MY_HWOPTS} | sed -e \"s/${x}//g\" -)"
fi fi
if [ "$(echo ${y} | cut -b -7)" = "keymap=" ] if [ "$(echo ${y} | cut -b -7)" = "keymap=" ]
then then
@ -685,23 +682,22 @@ cmdline_hwopts() {
fi fi
done done
done done
# Shouldnt need to sort this as the following loop should figure out the # Shouldnt need to sort this as the following loop should figure out the
# duplicates and strip them out # duplicates and strip them out
#MY_HWOPTS=`echo ${MY_HWOPTS}| sort` #MY_HWOPTS=$(echo ${MY_HWOPTS}| sort)
for x in ${MY_HWOPTS} for x in ${MY_HWOPTS}
do do
FOUND=0 FOUND=0
for y in ${TMP_HWOPTS} for y in ${TMP_HWOPTS}
do do
if [ "${y}" = "${x}" ] if [ "${y}" = "${x}" ]
then then
continue 2 continue 2
fi fi
done done
TMP_HWOPTS="${TMP_HWOPTS} ${x}" TMP_HWOPTS="${TMP_HWOPTS} ${x}"
eval DO_`echo ${x} | sed 's/-//'`=1 eval DO_$(echo ${x} | sed 's/-//')=1
done done
MY_HWOPTS=${TMP_HWOPTS} MY_HWOPTS=${TMP_HWOPTS}
@ -736,7 +732,7 @@ setup_keymap() {
[ -f /lib/keymaps/keymapList ] && chooseKeymap [ -f /lib/keymaps/keymapList ] && chooseKeymap
[ "${DEVBIND}" = '1' ] && umount /dev [ "${DEVBIND}" = '1' ] && umount /dev
if [ -e /etc/sysconfig/keyboard -a "${CDROOT}" = '1' ] if [ -e /etc/sysconfig/keyboard -a "${CDROOT}" = '1' ]
then then
mkdir -p ${NEW_ROOT}/etc/sysconfig/ mkdir -p ${NEW_ROOT}/etc/sysconfig/
@ -827,7 +823,7 @@ startVolumes() {
mkdir -p /dev/mapper mkdir -p /dev/mapper
ln -sf /dev/device-mapper /dev/mapper/control ln -sf /dev/device-mapper /dev/mapper/control
fi fi
if [ "${USE_MDADM}" = '1' ] if [ "${USE_MDADM}" = '1' ]
then then
if [ -e '/sbin/mdadm' ] if [ -e '/sbin/mdadm' ]
@ -838,15 +834,15 @@ startVolumes() {
fi fi
fi fi
if [ "${USE_MULTIPATH_NORMAL}" = '1' ] if [ "${USE_MULTIPATH_NORMAL}" = '1' ]
then then
good_msg "Scanning for multipath devices" good_msg "Scanning for multipath devices"
/sbin/multipath -v 0 /sbin/multipath -v 0
sleep 2 sleep 2
good_msg "Activating multipath devices" good_msg "Activating multipath devices"
/sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -v" /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -v"
#for MULTIPATH_VOLUMES in /dev/mapper/*; do kpartx -a $MULTIPATH_VOLUMES; done #for MULTIPATH_VOLUMES in /dev/mapper/*; do kpartx -a $MULTIPATH_VOLUMES; done
fi fi
if [ "${USE_DMRAID_NORMAL}" = '1' ] if [ "${USE_DMRAID_NORMAL}" = '1' ]
then then
@ -899,7 +895,7 @@ startVolumes() {
bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!" bad_msg "vgscan or vgchange not found: skipping LVM volume group activation!"
fi fi
fi fi
if [ "${USE_ZFS}" = '1' ] if [ "${USE_ZFS}" = '1' ]
then then
if [ -z "${ZFS_POOL}" ] if [ -z "${ZFS_POOL}" ]
@ -1005,7 +1001,7 @@ startiscsi() {
# $1 - root/swap # $1 - root/swap
openLUKS() { openLUKS() {
# please use 'tr' and this line, or remove it # please use 'tr' and this line, or remove it
# eval local TYPE=`uppercase $1` # eval local TYPE=$(uppercase $1)
case $1 in case $1 in
root) root)
@ -1058,10 +1054,10 @@ openLUKS() {
cryptsetup_options="${cryptsetup_options} --allow-discards" cryptsetup_options="${cryptsetup_options} --allow-discards"
fi fi
if [ -n "${LUKS_KEY}" ] if [ -n "${LUKS_KEY}" ]
then then
local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}" local REAL_LUKS_KEYDEV="${LUKS_KEYDEV}"
if [ ! -e "${mntkey}${LUKS_KEY}" ] if [ ! -e "${mntkey}${LUKS_KEY}" ]
then then
REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}") REAL_LUKS_KEYDEV=$(find_real_device "${LUKS_KEYDEV}")
if [ -b "${REAL_LUKS_KEYDEV}" ] if [ -b "${REAL_LUKS_KEYDEV}" ]
@ -1155,9 +1151,7 @@ openLUKS() {
} }
startLUKS() { startLUKS() {
# if key is set but key device isn't, find it # if key is set but key device isn't, find it
[ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \ [ -n "${CRYPT_ROOT_KEY}" ] && [ -z "${CRYPT_ROOT_KEYDEV}" ] \
&& sleep 6 && bootstrapKey "ROOT" && sleep 6 && bootstrapKey "ROOT"
@ -1238,10 +1232,10 @@ setup_md_device() {
[ -z "$1" ] && device="${REAL_ROOT}" || device="$1" [ -z "$1" ] && device="${REAL_ROOT}" || device="$1"
[ -z "${device}" ] && return # LiveCD [ -z "${device}" ] && return # LiveCD
if [ `echo ${device}|sed -e 's#\(luks:\)\?\(/dev/md\)[[:digit:]]\+#\2#'` = "/dev/md" ] if [ $(echo ${device}|sed -e 's#\(luks:\)\?\(/dev/md\)[[:digit:]]\+#\2#') = "/dev/md" ]
then then
good_msg 'Detected real_root as a md device. Setting up the device node...' good_msg 'Detected real_root as a md device. Setting up the device node...'
MD_NUMBER=`echo ${device}|sed -e 's#\(luks:\)\?/dev/md\([[:digit:]]\+\)#\2#'` MD_NUMBER=$(echo ${device}|sed -e 's#\(luks:\)\?/dev/md\([[:digit:]]\+\)#\2#')
if [ ! -e /dev/md${MD_NUMBER} ] if [ ! -e /dev/md${MD_NUMBER} ]
then then
mknod /dev/md${MD_NUMBER} b 9 ${MD_NUMBER} >/dev/null 2>&1 mknod /dev/md${MD_NUMBER} b 9 ${MD_NUMBER} >/dev/null 2>&1

19
defaults/linuxrc
Unescape View File

@ -254,13 +254,6 @@ do
aufs) aufs)
USE_AUFS_NORMAL=1 USE_AUFS_NORMAL=1
;; ;;
*=*)
case "${x%%=*}" in
*.*)
echo "${x#*.}" >> "/etc/module_options/${x%%.*}.conf"
;;
esac
;;
esac esac
done done
@ -539,9 +532,8 @@ do
prompt_user "REAL_ROOT" "root block device" prompt_user "REAL_ROOT" "root block device"
continue continue
fi fi
ROOT_DEV="${REAL_ROOT#*=}" ROOT_DEV="${REAL_ROOT#*=}"
if [ "${ROOT_DEV}" != 'ZFS' ] if [ "${ROOT_DEV}" != 'ZFS' ]
then then
if [ "$(zfs get type -o value -H ${ROOT_DEV})" = 'filesystem' ] if [ "$(zfs get type -o value -H ${ROOT_DEV})" = 'filesystem' ]
then then
@ -570,10 +562,8 @@ do
REAL_ROOT=${i} REAL_ROOT=${i}
ROOTFSTYPE=zfs ROOTFSTYPE=zfs
break break
fi fi
done
done;
else else
got_good_root=0 got_good_root=0
fi fi
@ -584,7 +574,6 @@ do
prompt_user "REAL_ROOT" "root block device" prompt_user "REAL_ROOT" "root block device"
got_good_root=0 got_good_root=0
fi fi
continue continue
;; ;;
esac esac
@ -866,7 +855,7 @@ for fs in $fslist; do
dev=$(get_mount_device $fs) dev=$(get_mount_device $fs)
[ -z "${dev}" ] && continue [ -z "${dev}" ] && continue
# Resolve it like util-linux mount does # Resolve it like util-linux mount does
[ -L ${dev} ] && dev=`readlink ${dev}` [ -L ${dev} ] && dev=$(readlink ${dev})
# In this case, it's probably part of the filesystem # In this case, it's probably part of the filesystem
# and not a mountpoint # and not a mountpoint
[ -z "$dev" ] && continue [ -z "$dev" ] && continue

7
defaults/modules_load
Unescape View File

@ -28,7 +28,12 @@ MODULES_USB="ehci-hcd uhci usb-ohci hid usb-storage uhci-hcd ohci-hcd xhci-hcd u
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse" MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs fuse"
# Crypto # Crypto
MODULES_CRYPTO="sha256_generic cbc aes_generic xts" MODULES_CRYPTO="sha1_generic sha256_generic sha512_generic cbc aes_generic aes-x86_64 xts"
# Backward compatibility with previous releases
MODULES_CRYPT="${MODULES_CRYPTO}"
# Virtio support (KVM mainly)
MODULES_VIRTIO="virtio virtio_balloon virtio_console virtio_net virtio_blk virtio_pci virtio_ring"
# DRM (Plymouth support) # DRM (Plymouth support)
MODULES_PLYMOUTH="uvesafb" MODULES_PLYMOUTH="uvesafb"

14
gen_configkernel.sh
Unescape View File

@ -118,12 +118,12 @@ config_kernel() {
fi fi
# Multipath # Multipath
if isTrue ${CMD_MULTIPATH} if isTrue ${CMD_MULTIPATH}
then then
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_BLK_DEV_DM is.*/CONFIG_BLK_DEV_DM=m/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH is.*/CONFIG_DM_MULTIPATH=m/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_DM_MULTIPATH_RDAC is.*/CONFIG_DM_MULTIPATH_RDAC=m/g'
fi fi
# Make sure dmraid modules are on if --dmraid # Make sure dmraid modules are on if --dmraid
if isTrue ${CMD_DMRAID} if isTrue ${CMD_DMRAID}
@ -147,10 +147,10 @@ config_kernel() {
then then
sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g' sed -i ${KERNEL_OUTPUTDIR}/.config -e 's/#\? \?CONFIG_FB_SPLASH is.*/CONFIG_FB_SPLASH=y/g'
fi fi
# VirtIO # VirtIO
if isTrue ${CMD_VIRTIO} if isTrue ${CMD_VIRTIO}
then then
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_PARAVIRT_GUEST.*/CONFIG_PARAVIRT_GUEST=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_PCI.*/CONFIG_VIRTIO_PCI=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_BALLOON.*/CONFIG_VIRTIO_BALLOON=y/g'
@ -159,5 +159,5 @@ config_kernel() {
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_SCSI_VIRTIO.*/CONFIG_SCSI_VIRTIO=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VIRTIO_NET.*/CONFIG_VIRTIO_NET=y/g'
sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g' sed -i ${KERNEL_DIR}/.config -e 's/#\? \?CONFIG_VHOST_NET.*/CONFIG_VHOST_NET=y/g'
fi fi
} }

45
gen_initramfs.sh
Unescape View File

@ -14,7 +14,7 @@ CPIO_ARGS="--quiet -o -H newc"
# CC0 are compatible with the GNU GPL." # CC0 are compatible with the GNU GPL."
# (from https://www.gnu.org/licenses/license-list.html#CC0) # (from https://www.gnu.org/licenses/license-list.html#CC0)
# #
# Written by: # Written by:
# - Sebastian Pipping <sebastian@pipping.org> (error checking) # - Sebastian Pipping <sebastian@pipping.org> (error checking)
# - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite) # - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
# - Richard Yao <ryao@cs.stonybrook.edu> (original concept) # - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
@ -201,7 +201,7 @@ append_multipath(){
copy_binaries "${TEMP}/initramfs-multipath-temp" \ copy_binaries "${TEMP}/initramfs-multipath-temp" \
/bin/mountpoint \ /bin/mountpoint \
/sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \ /sbin/{multipath,kpartx,mpath_prio_*,devmap_name,dmsetup} \
/{lib,lib64}/{udev/scsi_id,multipath/*so} /{lib,lib64}/{udev/scsi_id,multipath/*so}
if [ -x /sbin/multipath ] if [ -x /sbin/multipath ]
then then
@ -563,6 +563,7 @@ append_udev() {
" "
udev_maybe_files=" udev_maybe_files="
/lib/udev/rules.d/99-systemd.rules /lib/udev/rules.d/99-systemd.rules
/etc/modprobe.d/blacklist.conf
" "
is_maybe=0 is_maybe=0
for f in ${udev_files} -- ${udev_maybe_files}; do for f in ${udev_files} -- ${udev_maybe_files}; do
@ -647,42 +648,7 @@ append_modules() {
find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \ find . | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
|| gen_die "compressing modules cpio" || gen_die "compressing modules cpio"
cd "${TEMP}" cd "${TEMP}"
rm -r "${TEMP}/initramfs-modules-${KV}-temp/" rm -r "${TEMP}/initramfs-modules-${KV}-temp/"
}
append_modprobed() {
local TDIR="${TEMP}/initramfs-modprobe.d-temp"
if [ -d "${TDIR}" ]
then
rm -r "${TDIR}"
fi
mkdir -p "${TDIR}/etc/module_options/"
# Load module parameters
for dir in $(find "${MODPROBEDIR}"/*)
do
while read x
do
case "${x}" in
options*)
module_name="$(echo "$x" | cut -d ' ' -f 2)"
[ "${module_name}" != "$(echo)" ] || continue
module_options="$(echo "$x" | cut -d ' ' -f 3-)"
[ "${module_options}" != "$(echo)" ] || continue
echo "${module_options}" >> "${TDIR}/etc/module_options/${module_name}.conf"
;;
esac
done < "${dir}"
done
cd "${TDIR}"
log_future_cpio_content
find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}" \
|| gen_die "compressing modprobe.d cpio"
cd "${TEMP}"
rm -rf "${TDIR}" > /dev/null
} }
# check for static linked file with objdump # check for static linked file with objdump
@ -832,8 +798,6 @@ create_initramfs() {
append_data 'plymouth' "${PLYMOUTH}" append_data 'plymouth' "${PLYMOUTH}"
append_data 'modprobed'
if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ] if isTrue "${FIRMWARE}" && [ -n "${FIRMWARE_DIR}" ]
then then
append_data 'firmware' append_data 'firmware'
@ -940,7 +904,6 @@ create_initramfs() {
gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;; gzip) compress_ext='.gz' compress_cmd="${cmd_gzip} -f -9" ;;
lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;; lzop) compress_ext='.lzo' compress_cmd="${cmd_lzop} -f -9" ;;
esac esac
if [ -n "${compression}" ]; then if [ -n "${compression}" ]; then
print_info 1 " >> Compressing cpio data (${compress_ext})..." print_info 1 " >> Compressing cpio data (${compress_ext})..."
${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed" ${compress_cmd} "${CPIO}" || gen_die "Compression (${compress_cmd}) failed"

2
genkernel
Unescape View File

@ -2,7 +2,7 @@
# $Id$ # $Id$
PATH="${PATH}:/sbin:/usr/sbin" PATH="${PATH}:/sbin:/usr/sbin"
GK_V='3.4.45' GK_V='9999'
# Set the default for TMPDIR. May be modified by genkernel.conf or the # Set the default for TMPDIR. May be modified by genkernel.conf or the
# --tempdir command line option. # --tempdir command line option.

Write Preview
Loading…
Cancel
Save