[tyndur-devel] [PATCH] kernel2 wird Standard
Kevin Wolf ·
- .nobuild in kernel2 entfernt * menu.lst: Reihenfolge von kernel2 und kernel1 umgekehrt, so dass kernel2 Default wird. Sprachauswahl für kernel2 eingeführt, kernel1 ist jetzt nur noch in der deutschen Version im Menü. ! menu.lst: pci muss auch für kernel2 in der servmgr-Zeile aufgeführt werden Signed-off-by: Kevin Wolf <kevin at tyndur.org> --- build/config/grub_hd.cfg | 12 +----------- build/config/grub_hd_kernel2.cfg | 14 ++++++++++++-- build/scripts/image_hd | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 src/kernel2/.nobuild diff --git a/build/config/grub_hd.cfg b/build/config/grub_hd.cfg index 74c2133..b8dc878 100644 --- a/build/config/grub_hd.cfg +++ b/build/config/grub_hd.cfg @@ -1,4 +1,4 @@ -title tyndur (Deutsch) +title tyndur (kernel1) kernel /boot/tyndur debug=s module /modules/init boot=file:/ module /modules/pci @@ -7,13 +7,3 @@ module /modules/ext2 module /modules/console servmgr:/term servmgr:/term module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci boot - -title tyndur (English) -kernel /boot/tyndur debug=s -module /modules/init boot=file:/ env.LANG=en -module /modules/pci -module /modules/ata -module /modules/ext2 -module /modules/console servmgr:/term servmgr:/term -module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci -boot diff --git a/build/config/grub_hd_kernel2.cfg b/build/config/grub_hd_kernel2.cfg index 38d2b4b..0737858 100644 --- a/build/config/grub_hd_kernel2.cfg +++ b/build/config/grub_hd_kernel2.cfg @@ -1,9 +1,19 @@ -title tyndur2 +title tyndur2 (Deutsch) kernel /boot/tyndur2 debug=s module /modules/init boot=file:/ module /modules/pci module /modules/ata module /modules/ext2 module /modules/console servmgr:/term servmgr:/term -module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console +module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci +boot + +title tyndur (English) +kernel /boot/tyndur2 debug=s +module /modules/init boot=file:/ env.LANG=en +module /modules/pci +module /modules/ata +module /modules/ext2 +module /modules/console servmgr:/term servmgr:/term +module /modules/servmgr ata:/ata00_p0|ext2:/ vterm:/vterm8/out ata ext2 console pci boot diff --git a/build/scripts/image_hd b/build/scripts/image_hd index 85156e8..70ce748 100755 --- a/build/scripts/image_hd +++ b/build/scripts/image_hd @@ -92,12 +92,12 @@ cp -rP --preserve=links,timestamps $ROOT/* $ROOT_COMMON/* $ROOT_HD/* $MOUNT/ # GRUB-Konfiguration kopieren mkdir -p $MOUNT/boot/grub rm -f $MOUNT/boot/grub/menu.lst -if [ -e $MOUNT/boot/tyndur ]; then - cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/menu.lst -fi if [ -e $MOUNT/boot/tyndur2 ]; then cat build/config/grub_hd_kernel2.cfg >> $MOUNT/boot/grub/menu.lst fi +if [ -e $MOUNT/boot/tyndur ]; then + cat build/config/grub_hd.cfg >> $MOUNT/boot/grub/menu.lst +fi # Grub kopieren diff --git a/src/kernel2/.nobuild b/src/kernel2/.nobuild deleted file mode 100644 index e69de29..0000000 -- 1.6.0.2
Antworten
- [tyndur-devel] [PATCH] kernel2 wird Standard · Antoine Kaufmann