From 10560b543f298f4250e45d215814cc7955323385 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Sat, 10 May 2014 18:31:21 +0200 Subject: [PATCH] move floppy.conf to config/ Signed-off-by: Laurent Vivier --- Makefile | 2 +- config.mk | 3 +-- floppy.conf => config/floppy.conf | 0 3 files changed, 2 insertions(+), 3 deletions(-) rename floppy.conf => config/floppy.conf (100%) diff --git a/Makefile b/Makefile index c9d181b..1533265 100644 --- a/Makefile +++ b/Makefile @@ -358,7 +358,7 @@ clean:: libemile-clean libmacos-clean libunix-clean tools-clean first-clean \ multiboot.bin DISTFILES = AUTHORS ChangeLog COPYING Makefile README README.floppy \ - README.scsi Rules.mk floppy.conf kernel.mk config.mk \ + README.scsi Rules.mk config/floppy.conf kernel.mk config.mk \ scripts/tools.sh dist: diff --git a/config.mk b/config.mk index 68b4ce1..d69ebb9 100644 --- a/config.mk +++ b/config.mk @@ -9,7 +9,6 @@ PREFIX=/ # kernel boot arguments #FLOPPY=/dev/floppy/0 -FLOPPY=/dev/sda #CONSOLE=console=ttyS0,9600n8 console=tty0 #GESTALTID=43 @@ -18,7 +17,7 @@ RESCUE_ARGS="root=/dev/ramdisk ramdisk_size=2048 $(CONSOLE)" CDBOOT_ARGS="root=/dev/ramdisk ramdisk_size=13000 $(CONSOLE)" CDBOOT_ARGS26="root=/dev/ram ramdisk_size=13000 $(CONSOLE)" INSTALLER_ARGS="prompt_ramdisk=1 load_ramdisk=1 ramdisk_start=0 root=/dev/fd0 ramdisk_size=4096 $(CONSOLE)" -FLOPPY_CONF="floppy.conf" +FLOPPY_CONF="config/floppy.conf" BOOT_ARGS="root=/dev/sda4 $(CONSOLE)" LINUXPATH=vmlinux diff --git a/floppy.conf b/config/floppy.conf similarity index 100% rename from floppy.conf rename to config/floppy.conf