kylekrein/live-bootstrap
1
0
Fork 0
mirror of https://github.com/fosslinux/live-bootstrap.git synced 2026-03-24 20:16:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(payload-import): mount proc via syscall in payload-import and enumerate payload candidates strictly from /proc/partitions major/minor

Browse source
This commit is contained in:
vxtls 2026-03-02 10:42:58 -05:00
parent 96765e2121
commit 38f8769fce
2 changed files with 56 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
steps/improve/import_payload.sh
View file

@ -10,6 +10,10 @@ if [ "${PAYLOAD_REQUIRED}" = True ]; then
found_payload=0 found_payload=0
mkdir -p /dev mkdir -p /dev
if [ ! -r /proc/partitions ]; then
payload-import --mount-proc >/dev/null 2>&1 || :
fi
if [ ! -r /proc/partitions ]; then if [ ! -r /proc/partitions ]; then
echo "payload-import failed: /proc/partitions is unavailable." >&2 echo "payload-import failed: /proc/partitions is unavailable." >&2
exit 1 exit 1

53
steps/payload-import-1.0/src/payload-import.c
View file

@ -12,6 +12,7 @@
#define MAGIC_LEN 8 #define MAGIC_LEN 8
#define MAX_NAME_LEN 1024 #define MAX_NAME_LEN 1024
#define COPY_BUFSZ 65536 #define COPY_BUFSZ 65536
#define SYS_MOUNT 21
static unsigned int read_u32le(const unsigned char *buf) static unsigned int read_u32le(const unsigned char *buf)
{ {
@ -106,6 +107,51 @@ static int has_payload_magic(const char *path)
return 0; return 0;
} }
static int sys_mount(const char *source, const char *target,
const char *fstype, unsigned int flags, const void *data)
{
int ret;
__asm__ __volatile__(
"int $0x80"
: "=a"(ret)
: "0"(SYS_MOUNT),
"b"(source),
"c"(target),
"d"(fstype),
"S"(flags),
"D"(data)
: "memory"
);
return ret;
}
static int ensure_proc_partitions(void)
{
struct stat st;
int ret;
if (stat("/proc/partitions", &st) == 0) {
return 0;
}
if (mkdir("/proc", 0755) != 0 && errno != EEXIST) {
return 1;
}
ret = sys_mount("proc", "/proc", "proc", 0U, (const void *)0);
if (ret < 0) {
return 1;
}
if (stat("/proc/partitions", &st) != 0) {
return 1;
}
return 0;
}
static int extract_payload(const char *device, const char *dest_dir) static int extract_payload(const char *device, const char *dest_dir)
{ {
FILE *in; FILE *in;
@ -229,9 +275,10 @@ static void usage(const char *name)
{ {
fprintf(stderr, fprintf(stderr,
"Usage:\n" "Usage:\n"
" %s --mount-proc\n"
" %s --probe <device>\n" " %s --probe <device>\n"
" %s --device <device> <dest-dir>\n", " %s --device <device> <dest-dir>\n",
name, name); name, name, name);
} }
int main(int argc, char **argv) int main(int argc, char **argv)
@ -240,6 +287,10 @@ int main(int argc, char **argv)
const char *dest_dir = NULL; const char *dest_dir = NULL;
int i; int i;
if (argc == 2 && strcmp(argv[1], "--mount-proc") == 0) {
return ensure_proc_partitions();
}
if (argc == 3 && strcmp(argv[1], "--probe") == 0) { if (argc == 3 && strcmp(argv[1], "--probe") == 0) {
return has_payload_magic(argv[2]); return has_payload_magic(argv[2]);
} }