diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/conf/default/grub | 4 | ||||
| -rw-r--r-- | core/conf/pkgmk.conf | 11 | ||||
| -rw-r--r-- | core/configure.html | 22 |
3 files changed, 24 insertions, 13 deletions
diff --git a/core/conf/default/grub b/core/conf/default/grub new file mode 100644 index 0000000..cc7934a --- /dev/null +++ b/core/conf/default/grub @@ -0,0 +1,4 @@ +GRUB_DISABLE_LINUX_UUID=false +GRUB_ENABLE_LINUX_LABEL=false +GRUB_CMDLINE_LINUX="rd.luks.uuid=luks-15f15024-e994-43e3-9de4-694ba94aaf7f rd.lvm.lv=vg_system/lv_root" +GRUB_ENABLE_CRYPTODISK=y diff --git a/core/conf/pkgmk.conf b/core/conf/pkgmk.conf index 4085a38..4e4190c 100644 --- a/core/conf/pkgmk.conf +++ b/core/conf/pkgmk.conf @@ -2,10 +2,11 @@ # /etc/pkgmk.conf: pkgmk(8) configuration # -export CFLAGS="-O2 -g -march=x86-64 -pipe" +export CFLAGS="-O2 -march=x86-64 -pipe" export CXXFLAGS="${CFLAGS}" -# export MAKEFLAGS="-j2" +export JOBS=$(nproc) +export MAKEFLAGS="-j $JOBS" case ${PKGMK_ARCH} in "64"|"") @@ -22,14 +23,16 @@ case ${PKGMK_ARCH} in ;; esac -#PKGMK_SOURCE_MIRRORS=(http://machine.example.org/ports/distfiles/) +PKGMK_SOURCE_MIRRORS=(https://hive.gnu.systems/mirror/distfiles/) # PKGMK_SOURCE_DIR="$PWD" PKGMK_SOURCE_DIR="/usr/ports/distfiles" # PKGMK_PACKAGE_DIR="$PWD" PKGMK_PACKAGE_DIR="/usr/ports/packages" # PKGMK_WORK_DIR="$PWD/work" -PKGMK_WORK_DIR="/usr/ports/work/$name" +PKGMK_WORK_DIR="/usr/ports/work/${name}" # PKGMK_DOWNLOAD="no" +# PKGMK_IGNORE_SIGNATURE="no" +# PKGMK_IGNORE_MD5SUM="no" # PKGMK_IGNORE_FOOTPRINT="no" # PKGMK_IGNORE_NEW="no" # PKGMK_NO_STRIP="no" diff --git a/core/configure.html b/core/configure.html index 0387c4e..10d5823 100644 --- a/core/configure.html +++ b/core/configure.html @@ -18,22 +18,26 @@ </pre> <pre> - $ export BLK_EFI=/dev/sda1 - $ export BLK_BOOT=/dev/sda2 - $ export BLK_ROOT=/dev/sda3 - $ export BLK_VAR=/dev/sda5 - $ export BLK_USR=/dev/sda7 + $ export BLK_EFI=/dev/sda2 + $ export BLK_BOOT=/dev/sda3 + $ export BLK_ROOT=/dev/vg_system/lv_root + $ export BLK_VAR=/dev/vg_system/lv_var - $ export BLK_HOME=/dev/sda8 + $ export BLK_HOME=/dev/vg_system/lv_home $ sudo mount $BLK_BOOT $CHROOT/boot $ sudo mount $BLK_EFI $CHROOT/boot/efi $ sudo mount $BLK_VAR $CHROOT/var - $ sudo mount $BLK_USR $CHROOT/usr - $ sudo mount $BLK_HOME $CHROOT/home </pre> + <p>If using separate /usr partition;</p> + <pre> + $ export BLK_USR=/dev/vg_system/lv_usr + $ sudo mount $BLK_USR $CHROOT/usr + </pre> + + <p>Now you can chroot;</p> <pre> @@ -271,7 +275,7 @@ <a href="index.html">Core OS Index</a> <p>This is part of the Hive System Documentation. - Copyright (C) 2018 + Copyright (C) 2019 Hive Team. See the file <a href="../fdl-1.3-standalone.html">Gnu Free Documentation License</a> for copying conditions.</p> |