diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-26 15:32:12 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-11-26 15:32:12 +0000 |
| commit | 9b635572eccf92e269c38e7bb9ddeaf9bdad01b4 (patch) | |
| tree | 1e6ac5f6f4b1716371b78900929a9acb63230ef4 | |
| parent | 9fea4debc67d5ffd4d1a1aeacf88291bca51bee5 (diff) | |
| download | alpine-iso-9b635572eccf92e269c38e7bb9ddeaf9bdad01b4.tar.bz2 alpine-iso-9b635572eccf92e269c38e7bb9ddeaf9bdad01b4.tar.xz | |
rename initramfs image to initramfs-<flavor>
fix syslinux.cfg and isolinux.cfg generation
| -rwxr-xr-x | Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -111,7 +111,7 @@ clean-modloop: $(addprefix clean-modloop-,$(KERNEL_FLAVOR)) # # isolinux cannot handle - in filenames -INITFS_NAME := %.gz +INITFS_NAME := initramfs-% INITFS := $(ISO_DIR)/boot/$(INITFS_NAME) INITFS_DIR = $(DESTDIR)/initfs.$* @@ -237,14 +237,14 @@ ifeq ($(PROFILE), alpine-xen) @for flavor in $(KERNEL_FLAVOR); do \ echo "label xen-$$flavor"; \ echo " kernel /$(ISOLINUX_DIR)/mboot.c32"; \ - echo " append /boot/xen.gz $(XEN_PARAMS) --- /boot/$$flavor alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,floppy,sr-mod modloop=/boot/$$flavor.modloop.squashfs $(BOOT_OPTS) --- /boot/$$flavor.gz"; \ + echo " append /boot/xen.gz $(XEN_PARAMS) --- /boot/vmlinuz-$$flavor alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,sr-mod $(BOOT_OPTS) --- /boot/initramfs-$$flavor"; \ done >>$@ else @echo "default $(KERNEL_FLAVOR_DEFAULT)" >>$@ @for flavor in $(KERNEL_FLAVOR); do \ echo "label $$flavor"; \ - echo " kernel /boot/$$flavor"; \ - echo " append initrd=/boot/$$flavor.gz alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,floppy,sr-mod quiet $(BOOT_OPTS)"; \ + echo " kernel /boot/vmlinuz-$$flavor"; \ + echo " append initrd=/boot/initramfs-$$flavor alpine_dev=cdrom:iso9660 modules=loop,squashfs,sd-mod,usb-storage,sr-mod quiet $(BOOT_OPTS)"; \ done >>$@ endif @@ -258,14 +258,14 @@ ifeq ($(PROFILE), alpine-xen) @for flavor in $(KERNEL_FLAVOR); do \ echo "label xen-$$flavor"; \ echo " kernel /$(ISOLINUX_DIR)/mboot.c32"; \ - echo " append /boot/xen.gz $(XEN_PARAMS) --- /boot/$$flavor alpine_dev=usbdisk:vfat modules=loop,squashfs,sd-mod,usb-storage modloop=/boot/$$flavor.modloop.squashfs $(BOOT_OPTS) --- /boot/$$flavor.gz"; \ + echo " append /boot/xen.gz $(XEN_PARAMS) --- /boot/vmlinuz-$$flavor alpine_dev=usbdisk:vfat modules=loop,squashfs,sd-mod,usb-storage $(BOOT_OPTS) --- /boot/initramfs-$$flavor"; \ done >>$@ else @echo "default $(KERNEL_FLAVOR_DEFAULT)" >>$@ @for flavor in $(KERNEL_FLAVOR); do \ echo "label $$flavor"; \ - echo " kernel /boot/$$flavor"; \ - echo " append initrd=/boot/$$flavor.gz alpine_dev=usbdisk:vfat modules=loop,squashfs,sd-mod,usb-storage quiet $(BOOT_OPTS)"; \ + echo " kernel /boot/vmlinuz-$$flavor"; \ + echo " append initrd=/boot/initramfs-$$flavor alpine_dev=usbdisk:vfat modules=loop,squashfs,sd-mod,usb-storage quiet $(BOOT_OPTS)"; \ done >>$@ endif |