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 /pcr/lilo/lilo.conf | |
| parent | 3a14409a347f3423bf2a4ab847edff625b671e20 (diff) | |
| parent | 0a5c7083d197551290bc762f4ba90210cb733a5e (diff) | |
Merge branch 'master' of vparabola:abslibre
Conflicts:
java/not-working/java-bnd/PKGBUILD
libre/parabola-keyring/PKGBUILD
Diffstat (limited to 'pcr/lilo/lilo.conf')
| -rw-r--r-- | pcr/lilo/lilo.conf | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/pcr/lilo/lilo.conf b/pcr/lilo/lilo.conf new file mode 100644 index 000000000..479390df5 --- /dev/null +++ b/pcr/lilo/lilo.conf @@ -0,0 +1,25 @@ +# +# /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 + |