diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-04-07 00:46:34 -0400 |
| commit | 619b8d955269f2fe74386e98fac07675c8b55352 (patch) | |
| tree | f3e2610a39c99a7e43bc2b345280b04e398b986a /libre/lilo/lilo.conf | |
| parent | 2b04539ac9310541a4e563460aed0cb7715770d2 (diff) | |
| parent | 7d4e98b2d6f2fd4d42ebb55105bab8a05e34ab94 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
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 |