diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-30 12:15:42 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-06-30 12:15:42 +0000 |
| commit | f4f554426bd905b8b9e0170de2267dd43c54f3ff (patch) | |
| tree | b356b0ac9e6516afc79b43606f3def14b531f68a | |
| parent | 9495ba86b52cfbc6bb7ea4c2ba9cb1a8352af370 (diff) | |
| download | aports-f4f554426bd905b8b9e0170de2267dd43c54f3ff.tar.bz2 aports-f4f554426bd905b8b9e0170de2267dd43c54f3ff.tar.xz | |
main/syslinux: simplify passwd generation instructions
Don't bother mention salt or other crypto algorithms.
Also wrap the lines with comments.
| -rw-r--r-- | main/syslinux/APKBUILD | 6 | ||||
| -rw-r--r-- | main/syslinux/update-extlinux.conf | 24 |
2 files changed, 18 insertions, 12 deletions
diff --git a/main/syslinux/APKBUILD b/main/syslinux/APKBUILD index aefc79b1b..b10cef1f9 100644 --- a/main/syslinux/APKBUILD +++ b/main/syslinux/APKBUILD @@ -48,11 +48,11 @@ package() { } md5sums="67c8a85ca275d13b4f7f6139dd47d999 syslinux-5.10.tar.xz -ca2b5435e838b5938064f93edb2cd897 update-extlinux.conf +51df240c4da940cfb52cd8f31876402f update-extlinux.conf a7fc8fa30d7ae47e27ef15923ab3d05a update-extlinux" sha256sums="4b52d7647d5584c69764c06a836e0d524e5246bf2e94f68cf86342c415508422 syslinux-5.10.tar.xz -b72ac21426bbd52a55b130d5e4ca13f685780fd6719ee12235cd6bf3df30e32c update-extlinux.conf +8a626b74355b54f5a538b5e42094955987a7ca547d8b2a78797a5e3ca11cff1f update-extlinux.conf b54eb30280875e101623e362921b89cfe641648c14502aa1f5e04f9a52c492d4 update-extlinux" sha512sums="56422e14b4aa53ca1a5811da0582dbbb349aa52b9e78868bbedc24c67ef2420c4d0ac63fd68c7f0adc2c22606196276265d503b5b6f9d3d796d9ce42845bbdb5 syslinux-5.10.tar.xz -372bea3eb7e91207af6e227b1ffad1cb877b1f97292004fc7c05820250b8c42ab76775e086e57ea90bbdc80b8efb9e1f3b5cbe2ec1e95be69506ebddf26a89ae update-extlinux.conf +28f828f81abe183b4206438af639649391c54db4514cae426bba2635b195f6e3f95500df63b8e7085fe9c909139518e64e73c69e75273b0ccdf4f876b38875a5 update-extlinux.conf 4e929064fee5b76384608e426d689d536f705304a3998b0044882d03d79f8cc1f4a7be1a1e9b3690a1d2a3cba1ef5dca2989bb6d0223402770741be6de7bbce0 update-extlinux" diff --git a/main/syslinux/update-extlinux.conf b/main/syslinux/update-extlinux.conf index 947dfde2a..80eb5f13f 100644 --- a/main/syslinux/update-extlinux.conf +++ b/main/syslinux/update-extlinux.conf @@ -43,18 +43,24 @@ default=grsec # dom0_mem=256M (give domain-0 environment 256M ram) xen_opts=dom0_mem=256M -# if you copy /usr/share/syslinux/reboot.c32 to /boot/, a menu entry will be auto-generated for it +# if you copy /usr/share/syslinux/reboot.c32 to /boot/, a menu entry +# will be auto-generated for it -# if you copy /usr/share/syslinux/hdt.c32 to /boot/, a menu entry will be auto-generated for it +# if you copy /usr/share/syslinux/hdt.c32 to /boot/, a menu entry will +# be auto-generated for it -# if you download and install /boot/memtest, then if HDT is present it will use it, else a separate -# menu entry will be auto-generated for memtest +# if you download and install /boot/memtest, then if HDT is present it +# will use it, else a separate menu entry will be auto-generated for +# memtest # optional passwd -# you can generate a MD5 password using: mkpasswd --salt=yy --method=md5 -# you can generate a SHA1 password using: printf '$4$%s$%s$\n' xxxxxx $(printf xxxxxxpass | openssl sha1 -binary | base64 | sed 's/=$//') -# where yy are two "salt" characters from the set [./a-zA-Z0-9], and xxxxxx can be a longer "salt" from the same set +# you can generate a SHA512 password using: mkpasswd +# # if you assign a password, you should make this file world-unreadable -# if a password is assigned, the menu entries can't be edited at boot time, and HDT if present is password-protected -# you can also include "MENU PASSWD" in any custom entries you have in /etc/update-extlinux.d/ +# +# if a password is assigned, the menu entries can't be edited at boot +# time, and HDT if present is password-protected +# +# you can also include "MENU PASSWD" in any custom entries you have in +# /etc/update-extlinux.d/ password='' |