diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-03-03 22:03:39 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-03-04 08:59:47 +0100 |
| commit | 3b234388a5f545f071422864e1a274ba45a696a0 (patch) | |
| tree | f37b678ba513e480f69334f445c0fe35ec4bb925 /source/a/mkinitrd/mkinitrd_command_generator.sh | |
| parent | d26b7f6e82486c7fe02690ce5706b0660867c70b (diff) | |
| download | current-3b234388a5f545f071422864e1a274ba45a696a0.tar.gz current-3b234388a5f545f071422864e1a274ba45a696a0.tar.xz | |
Sun Mar 3 22:03:39 UTC 201920190303220339
a/mkinitrd-1.4.11-x86_64-12.txz: Rebuilt.
Updated to busybox-1.30.1.
mkinitrd: allow a colon-delimited list of kernel versions with -k
mkinitrd_command_generator.sh: allow a colon-delimited list of kernel
versions with -k
setup.01.mkinitrd: simplify script by using -k with a version list
ap/pamixer-1.4-x86_64-1.txz: Upgraded.
d/python-2.7.16-x86_64-1.txz: Upgraded.
Updated to the latest 2.7.x release, which fixes a few security issues.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-1752
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14647
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-5010
(* Security fix *)
d/vala-0.42.6-x86_64-1.txz: Upgraded.
l/gegl-0.4.14-x86_64-1.txz: Upgraded.
l/libsecret-0.18.8-x86_64-1.txz: Upgraded.
l/xapian-core-1.4.11-x86_64-1.txz: Upgraded.
x/mkfontscale-1.2.0-x86_64-1.txz: Upgraded.
x/xditview-1.0.5-x86_64-1.txz: Upgraded.
x/xdm-1.1.12-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/mkinitrd/mkinitrd_command_generator.sh')
| -rw-r--r-- | source/a/mkinitrd/mkinitrd_command_generator.sh | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/source/a/mkinitrd/mkinitrd_command_generator.sh b/source/a/mkinitrd/mkinitrd_command_generator.sh index df6f24c9c..489225be5 100644 --- a/source/a/mkinitrd/mkinitrd_command_generator.sh +++ b/source/a/mkinitrd/mkinitrd_command_generator.sh @@ -72,7 +72,9 @@ basic_usage() { -i | --interactive Navigate through menus instead of using commandline arguments. --longhelp Show more detailed information/examples. - -k <kernelversion> Use specific kernel version. + -k <kernelversion> Use specific kernel version. Or, support + more than one kernel version by passing a + list of versions separated by colons (:). -m <"additional mods"> Additional modules to pass to mkinitrd, separated by colons (:). -l | --lilo Only show lilo.conf section @@ -345,7 +347,7 @@ while [ ! -z "$1" ]; do echo "Error: -k requires a kernel version." exit 1 fi - KVER=$2 + KVERLIST=$2 shift 2 ;; -m) @@ -411,6 +413,15 @@ fi # Determine kernel version to use, # and check if modules for this kernel are actually present: +if [ ! -z $KVERLIST ]; then + for kernel_version in $(echo $KVERLIST | tr ":" "\n") ; do + KVER=$kernel_version + if [ ! -d /lib/modules/$KVER ]; then + echo "Modules for kernel $KVER aren't installed." + exit 1 + fi + done +fi if [ -z "$KVER" ]; then if [ -n "$KFILE" ]; then KVER="$(strings $KFILE | grep '([^ ]*@[^ ]*) #' | cut -f1 -d' ')" @@ -775,7 +786,11 @@ if [ -n "$MKINIT_MODS" ]; then fi # Constructing the mkinitrd command: -MKINIT="mkinitrd -c -k $KVER -f $ROOTFS -r $ROOTDEV" +if [ -z $KVERLIST ]; then + MKINIT="mkinitrd -c -k $KVER -f $ROOTFS -r $ROOTDEV" +else + MKINIT="mkinitrd -c -k $KVERLIST -f $ROOTFS -r $ROOTDEV" +fi # If we have a module list, add them: if ! [ -z "$MLIST" -o "$MLIST" = ":" ]; then |