aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2017-02-08 08:34:03 +0100
committerGerd Hoffmann <kraxel@redhat.com>2017-02-08 08:34:40 +0100
commita8418aaf57f0b1f30fe2fb6e3e35fbef699022a5 (patch)
tree456cf83a59e68f87af20422bc64cceb14bd1bbc6
parentf98cf64644b71f6dc0752ff0f06000f759f29d4c (diff)
downloadimagefish-a8418aaf57f0b1f30fe2fb6e3e35fbef699022a5.tar.gz
install kernel as separate step
-rwxr-xr-xF25-efi.sh2
-rwxr-xr-xF25-rpi32.sh2
-rwxr-xr-xRHEL73-efi.sh2
-rwxr-xr-xscripts/install-redhat.sh20
4 files changed, 18 insertions, 8 deletions
diff --git a/F25-efi.sh b/F25-efi.sh
index df9346c..5772b8d 100755
--- a/F25-efi.sh
+++ b/F25-efi.sh
@@ -2,7 +2,7 @@
name="fedora-25-efi"
repo="repos/fedora-25.repo"
-rpms="kernel grub2-efi shim"
+rpms="grub2-efi shim"
arch="$(uname -m)"
tar="${name}-${arch}.tar.gz"
diff --git a/F25-rpi32.sh b/F25-rpi32.sh
index a73430e..83163de 100755
--- a/F25-rpi32.sh
+++ b/F25-rpi32.sh
@@ -2,7 +2,7 @@
name="fedora-25-rpi2"
repo="repos/fedora-25.repo"
-rpms="bcm283x-firmware uboot-images-armv7 extlinux-bootloader dracut-config-generic kernel"
+rpms="bcm283x-firmware uboot-images-armv7 extlinux-bootloader dracut-config-generic"
arch="$(uname -m)"
tar="${name}-${arch}.tar.gz"
diff --git a/RHEL73-efi.sh b/RHEL73-efi.sh
index 8ad53cb..008222e 100755
--- a/RHEL73-efi.sh
+++ b/RHEL73-efi.sh
@@ -2,7 +2,7 @@
name="rhel-73-efi"
repo="repos/rhel-73.repo"
-rpms="kernel grub2-efi shim"
+rpms="grub2-efi shim"
arch="$(uname -m)"
tar="${name}-${arch}.tar.gz"
diff --git a/scripts/install-redhat.sh b/scripts/install-redhat.sh
index 15281a0..fda372b 100755
--- a/scripts/install-redhat.sh
+++ b/scripts/install-redhat.sh
@@ -7,7 +7,8 @@ dest=""
tarb=""
tool="dnf"
grps="core"
-rpms="kernel"
+rpms=""
+krnl="kernel"
conf=""
######################################################################
@@ -36,6 +37,7 @@ options:
what to install
--groups <groups> (default: $grps)
--packages <rpms> (default: $rpms)
+ --kernel <kernel> (default: $krnl)
package manager setup
--config <repos>
--dnf (default)
@@ -62,6 +64,10 @@ while test "$1" != ""; do
rpms="$2"
shift; shift
;;
+ -k | --kernel)
+ krnl="$2"
+ shift; shift
+ ;;
-c | --config)
conf="$2"
shift; shift
@@ -117,7 +123,7 @@ fi
case "$tool" in
dnf)
- tool="$tool -y --quiet --installroot ${dest}"
+ tool="$tool -y --installroot ${dest}"
if test "$conf" != ""; then
tool="$tool --config ${conf}"
tool="$tool --disablerepo=*"
@@ -125,7 +131,7 @@ dnf)
fi
;;
yum)
- tool="$tool -y --quiet --installroot ${dest}"
+ tool="$tool -y --installroot ${dest}"
if test "$conf" != ""; then
tool="$tool --config ${conf}"
fi
@@ -145,10 +151,14 @@ mkdir -p ${dest}/{dev,proc,sys,mnt}
inst=""
for item in $grps; do inst="${inst} @${item}"; done
for item in $rpms; do inst="${inst} ${item}"; done
-echo "### dnf install to $dest ..."
+echo "### dnf install packages to $dest ..."
#sudo mount --bind /dev $dest/dev
#sudo mount -o remount,bind,ro $dest/dev
-(set -x; sudo $tool install $inst) || exit 1
+(set -x; sudo $tool --quiet install $inst) || exit 1
+if test "$krnl" != ""; then
+ echo "### dnf install $krnl to $dest ..."
+ (set -x; sudo $tool install $krnl) || exit 1
+fi
sudo rm -rf "${dest}/var/cache/"{dnf,yum}
if test "$tarb" != ""; then