Unified · Split
| @@ -122,7 +122,7 @@ LABEL linux · 121 unmodified lines | |||
| 122 | MENU LABEL Boot Void GNU/Linux ${kver} ($(uname -m)) | 122 | MENU LABEL Boot Void GNU/Linux ${kver} ($(uname -m)) |
| 123 | KERNEL vmlinuz | 123 | KERNEL vmlinuz |
| 124 | APPEND initrd=initrd.lz root=live:CDLABEL=VoidLinux-live-$(uname -m)-${kver} \ | 124 | APPEND initrd=initrd.lz root=live:CDLABEL=VoidLinux-live-$(uname -m)-${kver} \ |
| 125 | rootfstype=auto ro liveimg rd.luks=0 rd.md=0 rd.dm=0 \ | 125 | rootfstype=auto ro liveimg rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 \ |
| 126 | vconsole.keymap=${KEYMAP} vconsole.unicode=1 locale.LANG=${LOCALE} | 126 | vconsole.keymap=${KEYMAP} vconsole.unicode=1 locale.LANG=${LOCALE} |
| 127 | LABEL c | 127 | LABEL c |
| 128 | MENU LABEL Boot first HD found by BIOS | 128 | MENU LABEL Boot first HD found by BIOS |
| @@ -349,10 +349,6 @@ cat > $ROOTFS/etc/xbps/local-repos.conf <<_EOF · 220 unmodified lines | |||
| 349 | repositories = { | 349 | repositories = { |
| 350 | # XBPS >= 0.16 | 350 | # XBPS >= 0.16 |
| 351 | /packages, | 351 | /packages, |
| 352 | # XBPS < 0.16 | ||
| 353 | /packages/noarch, | ||
| 354 | /packages/i686, | ||
| 355 | /packages/x86_64 | ||
| 356 | } | 352 | } |
| 357 | _EOF | 353 | _EOF |
| 358 | # Generate a conf for remote repositories. | 354 | # Generate a conf for remote repositories. |
| @@ -362,13 +358,6 @@ repositories = { · 3 unmodified lines | |||
| 362 | http://xbps.hosting-unlimited.org/binpkgs, | 358 | http://xbps.hosting-unlimited.org/binpkgs, |
| 363 | http://xbps.goodluckwith.us/binpkgs, | 359 | http://xbps.goodluckwith.us/binpkgs, |
| 364 | http://xbps.nopcode.org/repos/current, | 360 | http://xbps.nopcode.org/repos/current, |
| 365 | # XBPS < 0.16 | ||
| 366 | http://xbps.goodluckwith.us/binpkgs/i686, | ||
| 367 | http://xbps.goodluckwith.us/binpkgs/noarch, | ||
| 368 | http://xbps.goodluckwith.us/binpkgs/nonfree/i686, | ||
| 369 | http://xbps.nopcode.org/repos/current/x86_64, | ||
| 370 | http://xbps.nopcode.org/repos/current/noarch, | ||
| 371 | http://xbps.nopcode.org/repos/current/nonfree/x86_64 | ||
| 372 | } | 361 | } |
| 373 | _EOF | 362 | _EOF |
| 374 | chmod 644 $ROOTFS/etc/xbps/*.conf || error_out $? | 363 | chmod 644 $ROOTFS/etc/xbps/*.conf || error_out $? |
| @@ -406,6 +395,9 @@ _blkid=$(which blkid) · 31 unmodified lines | |||
| 406 | install -Dm755 ${_lsblk} "$ROOTFS/usr/bin/lsblk" || error_out $? | 395 | install -Dm755 ${_lsblk} "$ROOTFS/usr/bin/lsblk" || error_out $? |
| 407 | install -Dm755 ${_blkid} "$ROOTFS/sbin/blkid" || error_out $? | 396 | install -Dm755 ${_blkid} "$ROOTFS/sbin/blkid" || error_out $? |
| 408 | 397 | ||
| 398 | # install mount from util-linux. | ||
| 399 | install -Dm755 /bin/mount "$ROOTFS/bin/mount" || error_out $? | ||
| 400 | |||
| 409 | # | 401 | # |
| 410 | # The pseudofs aren't needed anymore in target rootfs. | 402 | # The pseudofs aren't needed anymore in target rootfs. |
| 411 | # | 403 | # |