From 436391decfbb2f1b3f24d0b073b40304a6aa8986 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 6 Feb 2008 12:24:06 -0300 Subject: [PATCH] Moved Moved architecture/x86/boot/lilo-* to package/x86/lilo/boot/ --- architecture/x86/boot/lilo-conf-144 | 30 -------- architecture/x86/boot/lilo-conf-1x2 | 29 -------- architecture/x86/boot/lilo-conf-288 | 29 -------- architecture/x86/boot/lilo-help.txt | 5 -- architecture/x86/boot/makeimages.sh | 106 ---------------------------- 5 files changed, 199 deletions(-) delete mode 100644 architecture/x86/boot/lilo-conf-144 delete mode 100644 architecture/x86/boot/lilo-conf-1x2 delete mode 100644 architecture/x86/boot/lilo-conf-288 delete mode 100644 architecture/x86/boot/lilo-help.txt delete mode 100644 architecture/x86/boot/makeimages.sh diff --git a/architecture/x86/boot/lilo-conf-144 b/architecture/x86/boot/lilo-conf-144 deleted file mode 100644 index d25e8e9..0000000 --- a/architecture/x86/boot/lilo-conf-144 +++ /dev/null @@ -1,30 +0,0 @@ -disk=/dev/floppy/0 - bios = 0x00 - sectors = 18 - heads = 2 - cylinders = 80 - -nowarn -boot=/dev/floppy/0 -install=/mnt/boot.b -map=/mnt/map -vga=normal -message=/mnt/lilo-help.txt -geometric -compact -prompt - -image=/mnt/vmlinuz - read-write - append="root=/dev/fd devfs=nomount \ - load_ramdisk=1 prompt_ramdisk=1 \ - ramdisk_size=4096 init=/linuxrc" - label=ramdisk - -image=/mnt/vmlinuz - label=linux - -image=/mnt/memtest.bin - label=memtest - optional - diff --git a/architecture/x86/boot/lilo-conf-1x2 b/architecture/x86/boot/lilo-conf-1x2 deleted file mode 100644 index dda3250..0000000 --- a/architecture/x86/boot/lilo-conf-1x2 +++ /dev/null @@ -1,29 +0,0 @@ -disk=/dev/floppy/0 - bios = 0x00 - sectors = 18 - heads = 2 - cylinders = 80 - -nowarn -boot=/dev/floppy/0 -install=/mnt/boot.b -map=/mnt/map -vga=normal -message=/mnt/lilo-help.txt -geometric -compact -prompt - -image=/mnt/vmlinuz - read-write - append="root=/dev/ram devfs=nomount init=/linuxrc" - initrd=/mnt/initrd.gz - label=ramdisk - -image=/mnt/vmlinuz - label=linux - -image=/mnt/memtest.bin - label=memtest - optional - diff --git a/architecture/x86/boot/lilo-conf-288 b/architecture/x86/boot/lilo-conf-288 deleted file mode 100644 index 22692f1..0000000 --- a/architecture/x86/boot/lilo-conf-288 +++ /dev/null @@ -1,29 +0,0 @@ -disk=/dev/floppy/0 - bios = 0x00 - sectors = 36 - heads = 2 - cylinders = 80 - -nowarn -boot=/dev/floppy/0 -install=/mnt/boot.b -map=/mnt/map -vga=normal -message=/mnt/lilo-help.txt -geometric -compact -prompt - -image=/mnt/vmlinuz - read-write - append="root=/dev/ram devfs=nomount init=/linuxrc" - initrd=/mnt/initrd.gz - label=ramdisk - -image=/mnt/vmlinuz - label=linux - -image=/mnt/memtest.bin - label=memtest - optional - diff --git a/architecture/x86/boot/lilo-help.txt b/architecture/x86/boot/lilo-help.txt deleted file mode 100644 index 65d71be..0000000 --- a/architecture/x86/boot/lilo-help.txt +++ /dev/null @@ -1,5 +0,0 @@ - -This is the T2-SDE install system (for Linux). -If you don't know what to do now just -press enter and start reading the documentation. - diff --git a/architecture/x86/boot/makeimages.sh b/architecture/x86/boot/makeimages.sh deleted file mode 100644 index b907ada..0000000 --- a/architecture/x86/boot/makeimages.sh +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh -# --- SDE-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# Filename: architecture/x86/boot/makeimages.sh -# Copyright (C) 2008 The OpenSDE Project -# Copyright (C) 2004 - 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. A copy of the -# GNU General Public License can be found in the file COPYING. -# --- SDE-COPYRIGHT-NOTE-END --- - -if [ "$1" = -reroot ] ; then - echo "Old PATH: $PATH" - PATH="../../sbin:../../bin:../../../sbin:../usr/bin:$PATH" - echo "New PATH: $PATH" - echo "Old LD_LIBRARY_PATH: $LD_LIBRARY_PATH" - export LD_LIBRARY_PATH="../../lib:../../usr/lib:$LD_LIBRARY_PATH" - LD_LIBRARY_PATH=${LD_LIBRARY_PATH%:} - echo "New LD_LIBRARY_PATH: $LD_LIBRARY_PATH" - shift -fi - -if [ "$1" = -combo ] ; then - combo=1 -elif [ "$#" != 0 ] ; then - echo "usage: $0 [-reroot] [-combo]" - exit 1 -fi - -tmpfile=`mktemp -p $PWD` -tmpdir=$tmpfile.dir -mkdir $tmpdir || exit 1 -rc=0 - -tmpdev= -for x in /dev/loop/* ; do - if losetup $x $tmpfile 2> /dev/null ; then - tmpdev=$x ; break - fi -done -if [ -z "$tmpdev" ] ; then - echo "No free loopback device found!" - rm -f $tmpfile ; rmdir $tmpdir - exit 1 -fi -echo "Using $tmpdev." - -for image in initrd boot_144 boot_288 -do - case ${image} in - initrd) - echo "Creating ${image}.gz ..." - size=4096 ;; - boot_144) - echo "Creating ${image}.img ..." - size=1440 ;; - boot_288) - echo "Creating ${image}.img ..." - size=2880 ;; - esac - - dd if=/dev/zero of=$tmpfile bs=1024 count=$size &> /dev/null - losetup -d $tmpdev ; losetup $tmpdev $tmpfile || rc=1 - mke2fs -q $tmpdev &> /dev/null ; mount $tmpdev $tmpdir || rc=1 - - case ${image} in - initrd) - cp -a initrd/* $tmpdir || rc=1 - ;; - - boot_144|boot_288) - cp -a boot/{vmlinuz,lilo-help.txt} $tmpdir || rc=1 - if [ -f /boot/boot-text.b ]; then - cp /boot/boot-text.b $tmpdir/boot.b || rc=1 - fi - liloconf=lilo-conf-${image#boot_} - if [ $image = boot_288 -o "$combo" = 1 ] ; then - cp initrd.gz $tmpdir || rc=1 - [ $image = boot_144 ] && liloconf=lilo-conf-1x2 - fi - sed -e "s,/mnt/,$tmpdir/,g" \ - -e "s,/dev/floppy/0,$tmpdev,;" \ - < boot/$liloconf > $tmpdir/lilo.conf || rc=1 - lilo -C $tmpdir/lilo.conf > /dev/null || rc=1 - ;; - esac - - umount $tmpdir - - case ${image} in - initrd) gzip -9 < $tmpfile > $image.gz || rc=1 ;; - *) cp $tmpfile $image.img || rc=1 ;; - esac -done - -losetup -d $tmpdev -rm -f $tmpfile -rmdir $tmpdir - -exit $rc -