diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-18 21:51:20 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-18 21:51:20 -0300 |
| commit | f0a7e44c0037beb1c6cf1c2e25d8de1a9e9393c8 (patch) | |
| tree | 6dda6d4856970e43904fc1e89cbeeb7157ea9ade /core/lilo/lilo.conf | |
| parent | 78538de96d5d6d9516ae18b68d4c62654eea5278 (diff) | |
| parent | 6ca29e0c62691c1f3120dda0f6b59dbb86cc9295 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cppcheck/PKGBUILD
Diffstat (limited to 'core/lilo/lilo.conf')
| -rw-r--r-- | core/lilo/lilo.conf | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/core/lilo/lilo.conf b/core/lilo/lilo.conf deleted file mode 100644 index 0e31e77a5..000000000 --- a/core/lilo/lilo.conf +++ /dev/null @@ -1,28 +0,0 @@ -# -# /etc/lilo.conf -# - -boot=/dev/hda -# This line often fixes L40 errors on bootup -# disk=/dev/hda bios=0x80 - -default=arch -timeout=50 -lba32 -prompt - -image=/boot/vmlinuz26 - label=arch - root=/dev/hda3 - initrd=/boot/kernel26.img - read-only - -image=/boot/vmlinuz26 - label=arch-fallback - root=/dev/hda3 - initrd=/boot/kernel26-fallback.img - read-only - -#other=/dev/hda1 -# label=dos - |