2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Removed %INSTALL_DIR% code

Browse source 
* Using hardcoded 'arch' in it's place
* The initrd boot variables weren't being set properly
This commit is contained in:
2Shirt 2017-12-30 12:17:30 -07:00
parent 886d9ae8c2
commit b70f1bda9a
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.linux_items/include/EFI/boot/refind.conf
View file

@ -24,7 +24,7 @@ menuentry "Linux" {
loader /arch/boot/x86_64/vmlinuz
initrd /arch/boot/intel_ucode.img
initrd /arch/boot/x86_64/archiso.img
options "archisobasedir=$INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3"
options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3"
submenuentry "Linux (i3)" {
add_options "i3"
}

2
.linux_items/include/isolinux/isolinux.cfg
View file

@ -2,5 +2,5 @@ PATH /%INSTALL_DIR%/boot/syslinux/
DEFAULT loadconfig
LABEL loadconfig
CONFIG /%INSTALL_DIR%/boot/syslinux/wklive.cfg
CONFIG /%INSTALL_DIR%/boot/syslinux/wk.cfg
APPEND /%INSTALL_DIR%/

4
Build Linux
View file

@ -110,6 +110,7 @@ function copy_live_env() {
rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/"
mkdir -p "$LIVE_DIR/airootfs/usr/local/bin"
rsync -aI "$ROOT_DIR/.bin/Scripts/" "$LIVE_DIR/airootfs/usr/local/bin/"
cp -a "$BUILD_DIR/main.py" "$LIVE_DIR/airootfs/usr/local/bin/"
}
function run_elevated() {
@ -144,8 +145,7 @@ function update_live_env() {
cp "$ROOT_DIR/Images/rEFInd.png" "$LIVE_DIR/EFI/boot/rEFInd.png"
rsync -aI "/usr/share/refind/drivers_x64/" "$LIVE_DIR/EFI/boot/drivers_x64/"
rsync -aI "/usr/share/refind/icons/" "$LIVE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg"
sed -i "s/%ARCHISO_LABEL%/${label}/;
s/%INSTALL_DIR%/${install_dir}/" "$LIVE_DIR/EFI/boot/refind.conf"
sed -i "s/%ARCHISO_LABEL%/${label}/" "$LIVE_DIR/EFI/boot/refind.conf"
# Memtest86
mkdir -p "$LIVE_DIR/EFI/memtest86/Benchmark"