diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-06-01 10:28:14 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-06-01 10:28:14 +0200 |
commit | 6142d9bb383134a876709765fed704815922db18 (patch) | |
tree | 9bbbb78a5ce1f8473dbae502634253f80a994331 /libre/mkisolinux/mkisolinux.conf | |
parent | 0dc1411695376442c13f473499a876f085074d75 (diff) | |
parent | f8a7f10fa1675bee536e1fdb4672c3d84e779d1c (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/aircrack-ng/PKGBUILD
community/fortune-mod/PKGBUILD
community/hping/PKGBUILD
community/iftop/PKGBUILD
community/uml_utilities/PKGBUILD
community/unhide/PKGBUILD
extra/kismet/PKGBUILD
extra/liblo/PKGBUILD
extra/libxinerama/PKGBUILD
extra/libxp/PKGBUILD
extra/libxres/PKGBUILD
extra/libxt/PKGBUILD
extra/libxtst/PKGBUILD
extra/libxxf86vm/PKGBUILD
extra/mtr/PKGBUILD
extra/transmission/PKGBUILD
Diffstat (limited to 'libre/mkisolinux/mkisolinux.conf')
-rw-r--r-- | libre/mkisolinux/mkisolinux.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libre/mkisolinux/mkisolinux.conf b/libre/mkisolinux/mkisolinux.conf index 83d36219d..4af6f098c 100644 --- a/libre/mkisolinux/mkisolinux.conf +++ b/libre/mkisolinux/mkisolinux.conf @@ -2,7 +2,7 @@ # Rebranded for Parabola by André Silva <emulatorman@lavabit.com> # config file of mkisolinux -# DEFAULT kernel boot options like root=/dev/hda3 etc. +# DEFAULT kernel boot options like root=/dev/sda3 etc. # add your root= option, if you boot from a disk device # and don't want to add it by hand on each boot KERNEL_BOOT_OPTIONS="" |