diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-15 13:43:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-15 13:44:33 +0000 |
| commit | 8cf17b70cbd1a769cccd0d0ab494ed3808608815 (patch) | |
| tree | e647cea9d8198ca2ee2a630933aeba4bc8f4ba33 /main/mkinitfs | |
| parent | e7ef39f84e323bf62987267b0bcc56f6603e1293 (diff) | |
| download | aports-8cf17b70cbd1a769cccd0d0ab494ed3808608815.tar.bz2 aports-8cf17b70cbd1a769cccd0d0ab494ed3808608815.tar.xz | |
main/mkinifs: fix trigger script to use unversioned kernel images
We now create unversioned kernel images so we must not overwrite those
with a symlink.
Let also update-extlinux deal with extlinux.conf
Diffstat (limited to 'main/mkinitfs')
| -rw-r--r-- | main/mkinitfs/APKBUILD | 2 | ||||
| -rw-r--r-- | main/mkinitfs/mkinitfs.trigger | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/main/mkinitfs/APKBUILD b/main/mkinitfs/APKBUILD index 93d8235128..e2d76a8027 100644 --- a/main/mkinitfs/APKBUILD +++ b/main/mkinitfs/APKBUILD @@ -2,7 +2,7 @@ pkgname=mkinitfs pkgver=2.5.3 _ver=${pkgver%_git*} -pkgrel=0 +pkgrel=1 pkgdesc="Tool to generate initramfs images for Alpine" url=http://git.alpinelinux.org/cgit/mkinitfs depends="busybox apk-tools>=2.0" diff --git a/main/mkinitfs/mkinitfs.trigger b/main/mkinitfs/mkinitfs.trigger index 4069d923f5..bee6c0a016 100644 --- a/main/mkinitfs/mkinitfs.trigger +++ b/main/mkinitfs/mkinitfs.trigger @@ -11,26 +11,8 @@ for i in "$@"; do continue fi abi_release=$(cat "$i"/kernel.release) - initfs=initramfs-$abi_release + initfs=initramfs-$flavor mkinitfs -o /boot/$initfs $abi_release - ln -sf $initfs /boot/initramfs-$flavor - ln -sf vmlinuz-$abi_release /boot/vmlinuz-$flavor - - #this is for compat. to be removed eventually... - ln -sf vmlinuz-$flavor /boot/$flavor - ln -sf initramfs-$flavor /boot/$flavor.gz - ln -sf /boot/vmlinuz-$flavor /$flavor - ln -sf /boot/initramfs-$flavor /$flavor.gz - - # Update the /boot/extlinux.conf to point to correct kernel - f=/boot/extlinux.conf - if [ -f $f ] && grep -q -- "kernel /$flavor" $f; then - sed -i -e "s:kernel /$flavor:kernel /boot/vmlinuz-$flavor:" \ - -e "s:initrd=/$flavor.gz:initrd=/boot/initramfs-$flavor:" \ - -e "s:initrd /$flavor.gz:initrd /boot/initramfs-$flavor:" \ - $f - fi - done # extlinux will use path relative partition, so if /boot is on a |