From 72259303b9201151c272c4b9e4a819e2d0805d57 Mon Sep 17 00:00:00 2001 From: 2Shirt Date: Sat, 13 Mar 2021 03:19:39 -0700 Subject: [PATCH] Mount RAM Disk in live-macOS --- scripts/wk/log.py | 7 ++----- setup/macos-live/live-macos-startup | 6 ++++++ setup/macos-live/update-base-image | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/scripts/wk/log.py b/scripts/wk/log.py index 2cb39764..01141ee1 100644 --- a/scripts/wk/log.py +++ b/scripts/wk/log.py @@ -13,10 +13,7 @@ from wk.io import non_clobber_path # STATIC VARIABLES -if os.path.exists('/.wk-live-macos'): - # Workaround for live macOS env - DEFAULT_LOG_DIR = '/var/log/WizardKit' -elif os.name == 'nt': +if os.name == 'nt': # Example: "C:\WK\1955-11-05\WizardKit" DEFAULT_LOG_DIR = ( f'{os.environ.get("SYSTEMDRIVE", "C:")}/' @@ -25,7 +22,7 @@ elif os.name == 'nt': ) else: # Example: "/home/tech/Logs" - DEFAULT_LOG_DIR = f'{os.path.expanduser("~")}/Logs' + DEFAULT_LOG_DIR = pathlib.Path('~/Logs').expanduser().resolve() DEFAULT_LOG_NAME = cfg.main.KIT_NAME_FULL diff --git a/setup/macos-live/live-macos-startup b/setup/macos-live/live-macos-startup index c8e0e65a..6bb2fdea 100755 --- a/setup/macos-live/live-macos-startup +++ b/setup/macos-live/live-macos-startup @@ -12,5 +12,11 @@ for p in /usr{/local/opt/{e2fsprogs,ruby,util-linux},/local,}/{bin,sbin}; do done export PATH +# Create and mount RAMDisk +if ! [ -d /Volumes/RAM_Disk ]; then + diskutil erasevolume HFS+ RAM_Disk $(hdiutil attach -nomount ram://524288) +fi +cd /Volumes/RAM_Disk + # Run cmd "$1" diff --git a/setup/macos-live/update-base-image b/setup/macos-live/update-base-image index f935a8b9..9900fd3d 100755 --- a/setup/macos-live/update-base-image +++ b/setup/macos-live/update-base-image @@ -35,6 +35,7 @@ cp -av /usr/bin/tput "${WK_DEV}"/usr/bin/ # WizardKit touch "${WK_DEV}"/.wk-live-macos +ln -s /Volumes/RAM_Disk/Logs "${WK_DEV}"/var/root/Logs cp -av ../../images/macOS.png "${WK_DEV}"/usr/local/wallpaper.png rsync -ahvPS /usr/bin/{env,killall} "${WK_DEV}"/usr/bin/ rsync -ahvPS live-macos-startup ../../scripts/ "${WK_DEV}"/usr/local/bin/