summaryrefslogtreecommitdiff
path: root/libre/lilo/lilo.conf
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-07-06 22:04:31 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-07-06 22:04:31 -0600
commit2967b22c6179ded9cc01496e10dcb0f292d0c182 (patch)
tree9219e7dc564f3dc8af29ea142c4b5d409ea74310 /libre/lilo/lilo.conf
parent55677d14e4829d6a7859333d3560db346c228fdf (diff)
parente84010fb9a6f81d96d9c54661a7abde97a0eb187 (diff)
Merge branch 'master-remote' into master-undelete
Diffstat (limited to 'libre/lilo/lilo.conf')
-rw-r--r--libre/lilo/lilo.conf25
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
-