diff options
| author | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@parabola.nu> | 2013-07-03 10:33:32 -0300 |
| commit | 8647aee53c2f9f5458e57fe7ac212da40a555594 (patch) | |
| tree | b99a8fbc859d18a244ea5ac496083e66ffaa330d /libre/lilo/lilo.conf | |
| parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
| parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
| download | abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.gz abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.tar.bz2 abslibre-8647aee53c2f9f5458e57fe7ac212da40a555594.zip | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to 'libre/lilo/lilo.conf')
| -rw-r--r-- | libre/lilo/lilo.conf | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf deleted file mode 100644 index 479390df5..000000000 --- a/libre/lilo/lilo.conf +++ /dev/null @@ -1,25 +0,0 @@ -# -# /etc/lilo.conf -# - -boot=/dev/sda -# This line often fixes L40 errors on bootup -# disk=/dev/sda bios=0x80 - -default=parabola -timeout=50 -lba32 -prompt - -image=/boot/vmlinuz-linux-libre - label=parabola - root=/dev/sda3 - initrd=/boot/initramfs-linux-libre.img - read-only - -image=/boot/vmlinuz-linux-libre - label=parabola-fallback - root=/dev/sda3 - initrd=/boot/initramfs-linux-libre-fallback.img - read-only - |