nortti/sortix-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add sysinstall(8) and sysupgrade(8) TMPDIR support.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2025-01-27 15:59:56 +01:00
parent e9afa83ccb
commit 9d1dba19a4
4 changed files with 31 additions and 10 deletions

8
sysinstall/fileops.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, 2017, 2020, 2021 Jonas 'Sortie' Termansen.
* Copyright (c) 2015-2017, 2020-2021, 2023-2025 Jonas 'Sortie' Termansen.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -254,3 +254,9 @@ char* akernelinfo(const char* request)
return NULL;
}
}
const char* get_tmpdir(void)
{
const char* tmpdir = getenv("TMPDIR");
return tmpdir ? tmpdir : "/tmp";
}

3
sysinstall/fileops.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, 2020 Jonas 'Sortie' Termansen.
* Copyright (c) 2015-2016, 2021, 2023-2025 Jonas 'Sortie' Termansen.
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -29,5 +29,6 @@ void write_random_seed(const char* path);
char* read_string_file(const char* path);
char** read_lines_file(const char* path, size_t* out_count);
char* akernelinfo(const char* request);
const char* get_tmpdir(void);
#endif

24
sysinstall/sysinstall.c
View file

@ -169,10 +169,16 @@ static bool should_install_bootloader_bdev(struct blockdevice* bdev)
return false;
if ( !bdev->fs->driver )
return false;
char mnt[] = "/tmp/fs.XXXXXX";
char* mnt = join_paths(get_tmpdir(), "fs.XXXXXX");
if ( !mnt )
{
warn("malloc");
return false;
}
if ( !mkdtemp(mnt) )
{
warn("mkdtemp: %s", "/tmp/fs.XXXXXX");
warn("mkdtemp: %s", mnt);
free(mnt);
return false;
}
struct mountpoint mp = { 0 };
@ -182,11 +188,13 @@ static bool should_install_bootloader_bdev(struct blockdevice* bdev)
if ( !mountpoint_mount(&mp) )
{
rmdir(mnt);
free(mnt);
return false;
}
bool should = should_install_bootloader_path(mnt, bdev);
mountpoint_unmount(&mp);
rmdir(mnt);
free(mnt);
return should;
}
@ -435,9 +443,9 @@ static pid_t main_pid;
static struct mountpoint* mountpoints;
static size_t mountpoints_used;
static bool etc_made = false;
static char etc[] = "/tmp/etc.XXXXXX";
static char* etc;
static bool fs_made = false;
static char fs[] = "/tmp/fs.XXXXXX";
static char* fs;
static int exit_gui_code = -1;
static void unmount_all_but_root(void)
@ -503,8 +511,10 @@ int main(void)
if ( atexit(exit_handler) != 0 )
err(2, "atexit");
if ( !(etc = join_paths(get_tmpdir(), "etc.XXXXXX")) )
err(2, "malloc");
if ( !mkdtemp(etc) )
err(2, "mkdtemp: %s", "/tmp/etc.XXXXXX");
err(2, "mkdtemp: %s", etc);
etc_made = true;
// Export for the convenience of users escaping to a shell.
setenv("SYSINSTALL_ETC", fs, 1);
@ -1052,8 +1062,10 @@ int main(void)
printf(" - Mounting filesystems...\n");
if ( !(fs = join_paths(get_tmpdir(), "fs.XXXXXX")) )
err(2, "malloc");
if ( !mkdtemp(fs) )
err(2, "mkdtemp: %s", "/tmp/fs.XXXXXX");
err(2, "mkdtemp: %s", fs);
fs_made = true;
// Export for the convenience of users escaping to a shell.
setenv("SYSINSTALL_TARGET", fs, 1);

6
sysinstall/sysupgrade.c
View file

@ -72,7 +72,7 @@ static pid_t main_pid;
static struct mountpoint* mountpoints;
static size_t mountpoints_used;
static bool fs_made = false;
static char fs[] = "/tmp/fs.XXXXXX";
static char* fs;
static int exit_gui_code = -1;
static bool add_installation(struct blockdevice* bdev,
@ -545,8 +545,10 @@ int main(void)
exit(2);
}
if ( !(fs = join_paths(get_tmpdir(), "fs.XXXXXX")) )
err(2, "malloc");
if ( !mkdtemp(fs) )
err(2, "mkdtemp: %s", "/tmp/fs.XXXXXX");
err(2, "mkdtemp: %s", fs);
fs_made = true;
// Export for the convenience of users escaping to a shell.
setenv("SYSINSTALL_TARGET", fs, 1);