diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-05-07 22:31:25 -0300 |
commit | 9f7fb9c12e84f20cd108b933f1a51e216f76cd98 (patch) | |
tree | 06520d9024b40745b94f02d0d3419386e6496863 /libre/lilo/lilo.conf | |
parent | 6cc893589a6bd208f2b7711f985e17df7a6df816 (diff) | |
parent | a86ff663185661ee304bb1f6d00d982102dd706d (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'libre/lilo/lilo.conf')
-rw-r--r-- | libre/lilo/lilo.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libre/lilo/lilo.conf b/libre/lilo/lilo.conf index dea0dbe58..479390df5 100644 --- a/libre/lilo/lilo.conf +++ b/libre/lilo/lilo.conf @@ -6,19 +6,19 @@ boot=/dev/sda # This line often fixes L40 errors on bootup # disk=/dev/sda bios=0x80 -default=libre +default=parabola timeout=50 lba32 prompt image=/boot/vmlinuz-linux-libre - label=libre + label=parabola root=/dev/sda3 initrd=/boot/initramfs-linux-libre.img read-only image=/boot/vmlinuz-linux-libre - label=libre-fallback + label=parabola-fallback root=/dev/sda3 initrd=/boot/initramfs-linux-libre-fallback.img read-only |