Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ endif
LIBQUARK_DEPS:= $(filter-out manpages.h, $(LIBQUARK_DEPS))
LIBQUARK_SRCS:= \
bpf_queue.c \
btf.c \
btfhub.c \
compat.c \
kprobe_queue.c \
quark.c \
qbtf.c \
qutil.c
LIBQUARK_OBJS:= $(patsubst %.c,%.o,$(LIBQUARK_SRCS))
LIBQUARK_STATIC:= libquark.a
Expand Down
5 changes: 2 additions & 3 deletions krun-fedora.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ function usage
echo " command... Command to run in guest"
echo
echo "Examples:"
echo " $SCRIPT initramfs.gz 40 /bin/bash"
echo " $SCRIPT -v initramfs.gz rawhide quark-test -vvv"
exit 1
}
Expand All @@ -45,7 +44,7 @@ shift 2
[[ -f ./krun.sh ]] || die "Required launcher ./krun.sh is missing"

case $FEDORAVER in
2?|3?) URL="https://archives.fedoraproject.org/pub/archive/fedora/linux/updates/$FEDORAVER/Everything/x86_64/Packages/k";;
2?|3?|40) URL="https://archives.fedoraproject.org/pub/archive/fedora/linux/updates/$FEDORAVER/Everything/x86_64/Packages/k";;
43|rawhide) URL="https://ftp.fau.de/fedora/linux/development/$FEDORAVER/Everything/x86_64/os/Packages/k";;
4?) URL="https://ftp.fau.de/fedora/linux/updates/$FEDORAVER/Everything/x86_64/Packages/k";;
*) die "Unsupported Fedora version: $FEDORAVER";;
Expand All @@ -59,7 +58,7 @@ cleanup() { [[ -d "$TMPDIR" ]] && rm -rf "$TMPDIR"; }
trap cleanup EXIT

log "Fetching package list from $URL"
RPMURL=$(lynx -dump -listonly "$URL"|grep kernel-core)
RPMURL=$(lynx -dump -listonly "$URL"|grep kernel-core) || die "Can't fetch package list"
RPMURL=${RPMURL##* }
RPM=$(basename "$RPMURL")
VMLINUZ=${RPM##kernel-core-}
Expand Down
3 changes: 1 addition & 2 deletions krun-rhel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ function usage
echo " command... Command to run in guest"
echo
echo "Examples:"
echo " $SCRIPT initramfs.gz 9 /bin/bash"
echo " $SCRIPT -v initramfs.gz 8.4 quark-test -vvv"
exit 1
}
Expand Down Expand Up @@ -60,7 +59,7 @@ cleanup() { [[ -d "$TMPDIR" ]] && rm -rf "$TMPDIR"; }
trap cleanup EXIT

log "Fetching package list from $URL"
RPMURL=$(lynx -dump -listonly "$URL"|grep kernel-core)
RPMURL=$(lynx -dump -listonly "$URL"|grep kernel-core) || die "Can't fetch package list"
RPMURL=${RPMURL##* }
RPM=$(basename "$RPMURL")
VMLINUZ=${RPM##kernel-core-}
Expand Down
1 change: 0 additions & 1 deletion krun-ubuntu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ usage() {
echo " command... Command to run in guest"
echo
echo "Examples:"
echo " $SCRIPT initramfs.gz 22.04 /bin/bash"
echo " $SCRIPT -v initramfs.gz 24.04 quark-test -vvv"
exit 1
}
Expand Down
File renamed without changes.
8 changes: 0 additions & 8 deletions quark.h
Original file line number Diff line number Diff line change
Expand Up @@ -90,14 +90,6 @@ struct bpf_probes *quark_get_bpf_probes(struct quark_queue *);
/* kprobe_queue.c */
int kprobe_queue_open(struct quark_queue *);

/* XXX terrible name XXX */
struct args {
char *buf;
size_t buf_len;
int argc;
const char *argv[];
};

/* qutil.c */
struct qstr {
char *p;
Expand Down