Compare commits

..

No commits in common. "d1559793df555212271e490a4a72f55826caf5b4" and "f4dad55b8b2861426a7b9e7104dec33acb770894" have entirely different histories.

246 changed files with 402 additions and 21 deletions

View File

@ -42,7 +42,7 @@
<citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>. <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
Available naming schemes are described below.</para> Available naming schemes are described below.</para>
<para>After the udev properties have been generated, appropriate udev rules may be used to actually rename <para>After the udev proprties have been generated, appropriate udev rules may be used to actually rename
devices based on those properties. See the description of <varname>NamePolicy=</varname> and devices based on those properties. See the description of <varname>NamePolicy=</varname> and
<varname>MACAddressPolicy=</varname> in <varname>MACAddressPolicy=</varname> in
<citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para> <citerefentry><refentrytitle>systemd.link</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>

View File

@ -3,6 +3,7 @@
#include <getopt.h> #include <getopt.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/socket.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>

View File

@ -5,6 +5,7 @@
#include <getopt.h> #include <getopt.h>
#include <inttypes.h> #include <inttypes.h>
#include <locale.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>

View File

@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <sys/stat.h>
#include <sys/statfs.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -10,7 +10,10 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <unistd.h> #include <unistd.h>

View File

@ -3,6 +3,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "string-util.h" #include "string-util.h"

View File

@ -1,8 +1,10 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <errno.h> #include <errno.h>
#include <grp.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/capability.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <unistd.h> #include <unistd.h>

View File

@ -1,11 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <ftw.h> #include <ftw.h>
#include <limits.h> #include <limits.h>
#include <signal.h> #include <signal.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/xattr.h> #include <sys/xattr.h>

View File

@ -1,9 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "conf-files.h" #include "conf-files.h"
#include "def.h" #include "def.h"

View File

@ -1,12 +1,16 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/sendfile.h> #include <sys/sendfile.h>
#include <sys/stat.h>
#include <sys/xattr.h> #include <sys/xattr.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -4,7 +4,9 @@
#include <fcntl.h> #include <fcntl.h>
#include <limits.h> #include <limits.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

View File

@ -4,6 +4,7 @@
#include <limits.h> #include <limits.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -6,6 +6,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <syslog.h> #include <syslog.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/socket.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

View File

@ -8,6 +8,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio_ext.h> #include <stdio_ext.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

View File

@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <stdio.h>
#include "format-util.h" #include "format-util.h"
#include "memory-util.h" #include "memory-util.h"
#include "stdio-util.h" #include "stdio-util.h"

View File

@ -2,9 +2,13 @@
#include <errno.h> #include <errno.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <linux/falloc.h> #include <linux/falloc.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#if HAVE_GCRYPT #if HAVE_GCRYPT
#include <gcrypt.h>
#include "gcrypt-util.h" #include "gcrypt-util.h"
#include "hexdecoct.h" #include "hexdecoct.h"

View File

@ -1,6 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <glob.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

View File

@ -3,6 +3,7 @@
#include <glob.h> #include <glob.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h>
#include "macro.h" #include "macro.h"
#include "string-util.h" #include "string-util.h"

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "fileio.h" #include "fileio.h"

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <unistd.h> #include <unistd.h>

View File

@ -4,6 +4,7 @@
#include <limits.h> #include <limits.h>
#include <poll.h> #include <poll.h>
#include <stdio.h> #include <stdio.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include "io-util.h" #include "io-util.h"

View File

@ -1,13 +1,16 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <ftw.h> #include <ftw.h>
#include <langinfo.h> #include <langinfo.h>
#include <libintl.h> #include <libintl.h>
#include <locale.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -6,10 +6,14 @@
#include <limits.h> #include <limits.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <sys/signalfd.h> #include <sys/signalfd.h>
#include <sys/socket.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <sys/un.h> #include <sys/un.h>
#include <time.h>
#include <unistd.h> #include <unistd.h>
#include "sd-messages.h" #include "sd-messages.h"

View File

@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <string.h>
#include "login-util.h" #include "login-util.h"
#include "string-util.h" #include "string-util.h"

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h> #include <string.h>
#include <sys/stat.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "format-util.h" #include "format-util.h"

View File

@ -3,9 +3,11 @@
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <linux/oom.h> #include <linux/oom.h>
#include <locale.h>
#include <net/if.h> #include <net/if.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/socket.h> #include <sys/socket.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -4,6 +4,8 @@
#include <limits.h> #include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
/* When we include libgen.h because we need dirname() we immediately /* When we include libgen.h because we need dirname() we immediately

View File

@ -2,6 +2,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "efivars.h" #include "efivars.h"

View File

@ -4,9 +4,11 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <linux/oom.h> #include <linux/oom.h>
#include <signal.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/personality.h> #include <sys/personality.h>

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once #pragma once
#include <alloca.h>
#include <errno.h> #include <errno.h>
#include <sched.h> #include <sched.h>
#include <signal.h> #include <signal.h>

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "macro.h" #include "macro.h"

View File

@ -4,6 +4,8 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -2,6 +2,7 @@
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h>
#include "macro.h" #include "macro.h"
#include "parse-util.h" #include "parse-util.h"

View File

@ -7,6 +7,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/xattr.h> #include <sys/xattr.h>
#include <unistd.h> #include <unistd.h>

View File

@ -5,6 +5,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>

View File

@ -11,6 +11,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <unistd.h> #include <unistd.h>

View File

@ -1,8 +1,11 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/magic.h>
#include <sched.h> #include <sched.h>
#include <sys/stat.h>
#include <sys/statvfs.h> #include <sys/statvfs.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

View File

@ -5,6 +5,7 @@
#include <errno.h> #include <errno.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <sys/types.h> #include <sys/types.h>
#include "macro.h" #include "macro.h"

View File

@ -5,6 +5,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "escape.h" #include "escape.h"

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once #pragma once
#include <alloca.h>
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>

View File

@ -5,6 +5,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "escape.h" #include "escape.h"

View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <string.h>
#include <syslog.h> #include <syslog.h>
#include "hexdecoct.h" #include "hexdecoct.h"

View File

@ -11,8 +11,10 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h>
#include <sys/sysmacros.h> #include <sys/sysmacros.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -4,7 +4,9 @@
#include <errno.h> #include <errno.h>
#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/timerfd.h> #include <sys/timerfd.h>
#include <sys/timex.h> #include <sys/timex.h>

View File

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <stdio.h>
#include <sys/mman.h> #include <sys/mman.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -4,6 +4,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "glob-util.h" #include "glob-util.h"

View File

@ -1,11 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <alloca.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <grp.h>
#include <pwd.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <utmp.h> #include <utmp.h>

View File

@ -26,6 +26,7 @@
#include <errno.h> #include <errno.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "gunicode.h" #include "gunicode.h"

View File

@ -1,22 +1,48 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <alloca.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sched.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/prctl.h>
#include <sys/statfs.h>
#include <sys/sysmacros.h>
#include <sys/types.h>
#include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "btrfs-util.h"
#include "build.h" #include "build.h"
#include "def.h"
#include "device-nodes.h"
#include "dirent-util.h" #include "dirent-util.h"
#include "env-file.h" #include "env-file.h"
#include "env-util.h" #include "env-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "fileio.h" #include "fileio.h"
#include "format-util.h"
#include "hashmap.h"
#include "hostname-util.h" #include "hostname-util.h"
#include "log.h" #include "log.h"
#include "macro.h" #include "macro.h"
#include "parse-util.h" #include "parse-util.h"
#include "path-util.h"
#include "process-util.h"
#include "procfs-util.h"
#include "set.h"
#include "signal-util.h"
#include "stat-util.h" #include "stat-util.h"
#include "string-util.h" #include "string-util.h"
#include "strv.h"
#include "time-util.h"
#include "umask-util.h"
#include "user-util.h"
#include "util.h" #include "util.h"
#include "virt.h" #include "virt.h"

View File

@ -6,6 +6,7 @@
#include <errno.h> #include <errno.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -4,6 +4,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/xattr.h> #include <sys/xattr.h>

View File

@ -6,6 +6,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -1,14 +1,20 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <blkid.h>
#include <ctype.h> #include <ctype.h>
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <ftw.h> #include <ftw.h>
#include <getopt.h> #include <getopt.h>
#include <limits.h> #include <limits.h>
#include <linux/magic.h> #include <linux/magic.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h>
#include <sys/statfs.h>
#include <unistd.h> #include <unistd.h>
#include "sd-id128.h" #include "sd-id128.h"

View File

@ -1300,7 +1300,6 @@ static VOID config_entry_bump_counters(
static VOID config_entry_add_from_file( static VOID config_entry_add_from_file(
Config *config, Config *config,
EFI_HANDLE *device, EFI_HANDLE *device,
EFI_FILE *root_dir,
CHAR16 *path, CHAR16 *path,
CHAR16 *file, CHAR16 *file,
CHAR8 *content, CHAR8 *content,
@ -1311,8 +1310,6 @@ static VOID config_entry_add_from_file(
UINTN pos = 0; UINTN pos = 0;
CHAR8 *key, *value; CHAR8 *key, *value;
UINTN len; UINTN len;
EFI_STATUS err;
EFI_FILE_HANDLE handle;
_cleanup_freepool_ CHAR16 *initrd = NULL; _cleanup_freepool_ CHAR16 *initrd = NULL;
entry = AllocatePool(sizeof(ConfigEntry)); entry = AllocatePool(sizeof(ConfigEntry));
@ -1409,14 +1406,6 @@ static VOID config_entry_add_from_file(
return; return;
} }
/* check existence */
err = uefi_call_wrapper(root_dir->Open, 5, root_dir, &handle, entry->loader, EFI_FILE_MODE_READ, 0ULL);
if (EFI_ERROR(err)) {
config_entry_free(entry);
return;
}
uefi_call_wrapper(handle->Close, 1, handle);
/* add initrd= to options */ /* add initrd= to options */
if (entry->type == LOADER_LINUX && initrd) { if (entry->type == LOADER_LINUX && initrd) {
if (entry->options) { if (entry->options) {
@ -1514,7 +1503,7 @@ static VOID config_load_entries(
err = file_read(entries_dir, f->FileName, 0, 0, &content, NULL); err = file_read(entries_dir, f->FileName, 0, 0, &content, NULL);
if (!EFI_ERROR(err)) if (!EFI_ERROR(err))
config_entry_add_from_file(config, device, root_dir, L"\\loader\\entries", f->FileName, content, loaded_image_path); config_entry_add_from_file(config, device, L"\\loader\\entries", f->FileName, content, loaded_image_path);
} }
uefi_call_wrapper(entries_dir->Close, 1, entries_dir); uefi_call_wrapper(entries_dir->Close, 1, entries_dir);
} }

View File

@ -342,6 +342,8 @@ static int list_bus_names(int argc, char **argv, void *userdata) {
if (r < 0) if (r < 0)
return log_error_errno(r, "Failed to show table: %m"); return log_error_errno(r, "Failed to show table: %m");
return 0; return 0;
} }

View File

@ -3,6 +3,7 @@
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "sd-bus.h" #include "sd-bus.h"

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <stdlib.h> #include <stdlib.h>
#include <sys/socket.h>
#include "fd-util.h" #include "fd-util.h"
#include "log.h" #include "log.h"

View File

@ -1,10 +1,12 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <alloca.h>
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <signal.h> #include <signal.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "sd-bus.h" #include "sd-bus.h"

View File

@ -12,6 +12,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -1,5 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <grp.h>
#include <pwd.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -2,13 +2,20 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <glob.h>
#include <grp.h>
#include <poll.h> #include <poll.h>
#include <signal.h>
#include <string.h>
#include <sys/capability.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/personality.h> #include <sys/personality.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/shm.h> #include <sys/shm.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>

View File

@ -418,21 +418,21 @@ JobType job_type_collapse(JobType t, Unit *u) {
case JOB_TRY_RESTART: case JOB_TRY_RESTART:
s = unit_active_state(u); s = unit_active_state(u);
if (!UNIT_IS_ACTIVE_OR_RELOADING(s)) if (UNIT_IS_INACTIVE_OR_DEACTIVATING(s))
return JOB_NOP; return JOB_NOP;
return JOB_RESTART; return JOB_RESTART;
case JOB_TRY_RELOAD: case JOB_TRY_RELOAD:
s = unit_active_state(u); s = unit_active_state(u);
if (!UNIT_IS_ACTIVE_OR_RELOADING(s)) if (UNIT_IS_INACTIVE_OR_DEACTIVATING(s))
return JOB_NOP; return JOB_NOP;
return JOB_RELOAD; return JOB_RELOAD;
case JOB_RELOAD_OR_START: case JOB_RELOAD_OR_START:
s = unit_active_state(u); s = unit_active_state(u);
if (!UNIT_IS_ACTIVE_OR_RELOADING(s)) if (UNIT_IS_INACTIVE_OR_DEACTIVATING(s))
return JOB_START; return JOB_START;
return JOB_RELOAD; return JOB_RELOAD;

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <ftw.h> #include <ftw.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"
@ -12,6 +13,7 @@
#include "string-util.h" #include "string-util.h"
#if HAVE_KMOD #if HAVE_KMOD
#include <libkmod.h>
#include "module-util.h" #include "module-util.h"
static void systemd_kmod_log( static void systemd_kmod_log(

View File

@ -11,7 +11,9 @@
#include <seccomp.h> #include <seccomp.h>
#endif #endif
#include <sched.h> #include <sched.h>
#include <string.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/stat.h>
#include "af-list.h" #include "af-list.h"
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -2,6 +2,7 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include "env-file.h" #include "env-file.h"
#include "env-util.h" #include "env-util.h"

View File

@ -3,9 +3,13 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <getopt.h> #include <getopt.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/reboot.h> #include <sys/reboot.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#if HAVE_SECCOMP #if HAVE_SECCOMP
#include <seccomp.h> #include <seccomp.h>

View File

@ -3,6 +3,8 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <linux/kd.h> #include <linux/kd.h>
#include <signal.h>
#include <string.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>

View File

@ -3,7 +3,9 @@
#include <errno.h> #include <errno.h>
#include <sched.h> #include <sched.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <linux/fs.h> #include <linux/fs.h>

View File

@ -7,6 +7,7 @@
#include <errno.h> #include <errno.h>
#include <selinux/avc.h> #include <selinux/avc.h>
#include <selinux/selinux.h> #include <selinux/selinux.h>
#include <stdio.h>
#if HAVE_AUDIT #if HAVE_AUDIT
#include <libaudit.h> #include <libaudit.h>
#endif #endif

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <errno.h> #include <errno.h>
#include <signal.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

View File

@ -5,10 +5,12 @@
Nathaniel Chen <nathaniel.chen@intel.com> Nathaniel Chen <nathaniel.chen@intel.com>
***/ ***/
#include <dirent.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -5,6 +5,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <mqueue.h> #include <mqueue.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <signal.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

View File

@ -727,6 +727,7 @@ static void swap_enter_signal(Swap *s, SwapState state, SwapResult f) {
if (s->result == SWAP_SUCCESS) if (s->result == SWAP_SUCCESS)
s->result = f; s->result = f;
r = unit_kill_context(UNIT(s), r = unit_kill_context(UNIT(s),
&s->kill_context, &s->kill_context,
state_to_kill_operation(s, state), state_to_kill_operation(s, state),
@ -928,6 +929,7 @@ static int swap_stop(Unit *u) {
swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS); swap_enter_signal(s, SWAP_DEACTIVATING_SIGKILL, SWAP_SUCCESS);
return 0; return 0;
default: default:
assert_not_reached("Unexpected state."); assert_not_reached("Unexpected state.");
} }

View File

@ -2,7 +2,9 @@
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include "sd-id128.h" #include "sd-id128.h"

View File

@ -4,6 +4,7 @@
#include <getopt.h> #include <getopt.h>
#include <locale.h> #include <locale.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "sd-bus.h" #include "sd-bus.h"

View File

@ -2,6 +2,7 @@
#include <errno.h> #include <errno.h>
#include <mntent.h> #include <mntent.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -2,6 +2,7 @@
#include <errno.h> #include <errno.h>
#include <getopt.h> #include <getopt.h>
#include <string.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <unistd.h> #include <unistd.h>

View File

@ -6,6 +6,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -1,7 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <errno.h> #include <errno.h>
#include <mntent.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -2,6 +2,7 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -1,6 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <blkid.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/statfs.h>
#include <unistd.h> #include <unistd.h>
#include "sd-device.h" #include "sd-device.h"

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <errno.h> #include <errno.h>
#include <string.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -2,8 +2,11 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#include <sys/socket.h>
#include <stdint.h> #include <stdint.h>
#include "sd-daemon.h" #include "sd-daemon.h"

View File

@ -2,6 +2,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#if HAVE_GNUTLS #if HAVE_GNUTLS
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once #pragma once
#include <alloca.h>
#include <stdio.h> #include <stdio.h>
#include "alloc-util.h" #include "alloc-util.h"

View File

@ -4,6 +4,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <locale.h> #include <locale.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>

View File

@ -2,6 +2,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@ -27,6 +27,7 @@
* http://eprint.iacr.org/2013/397 * http://eprint.iacr.org/2013/397
*/ */
#include <gcrypt.h>
#include <string.h> #include <string.h>
#include "fsprg.h" #include "fsprg.h"

View File

@ -4,6 +4,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <printf.h> #include <printf.h>
#include <stddef.h> #include <stddef.h>
#include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <unistd.h> #include <unistd.h>

View File

@ -5,11 +5,13 @@
#include <fnmatch.h> #include <fnmatch.h>
#include <getopt.h> #include <getopt.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <locale.h>
#include <poll.h> #include <poll.h>
#include <signal.h> #include <signal.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
@ -2240,6 +2242,9 @@ int main(int argc, char *argv[]) {
HASHMAP_FOREACH(d, j->directories_by_path, i) { HASHMAP_FOREACH(d, j->directories_by_path, i) {
int q; int q;
if (d->is_root)
continue;
q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet); q = journal_directory_vacuum(d->path, arg_vacuum_size, arg_vacuum_n_files, arg_vacuum_time, NULL, !arg_quiet);
if (q < 0) { if (q < 0) {
log_error_errno(q, "Failed to vacuum %s: %m", d->path); log_error_errno(q, "Failed to vacuum %s: %m", d->path);

View File

@ -1,6 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1+ */ /* SPDX-License-Identifier: LGPL-2.1+ */
#include <errno.h> #include <errno.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "hashmap.h" #include "hashmap.h"

View File

@ -9,6 +9,7 @@
#include <net/if_arp.h> #include <net/if_arp.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/socket.h>
#include <linux/filter.h> #include <linux/filter.h>
#include <linux/if_infiniband.h> #include <linux/if_infiniband.h>
#include <linux/if_packet.h> #include <linux/if_packet.h>

View File

@ -6,6 +6,7 @@
#include <errno.h> #include <errno.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <string.h>
#include "alloc-util.h" #include "alloc-util.h"
#include "dhcp-internal.h" #include "dhcp-internal.h"

View File

@ -8,6 +8,7 @@
#include <netinet/ip6.h> #include <netinet/ip6.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <linux/if_packet.h> #include <linux/if_packet.h>

View File

@ -5,6 +5,7 @@
#include <errno.h> #include <errno.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <string.h>
#include "sd-dhcp6-client.h" #include "sd-dhcp6-client.h"

View File

@ -9,6 +9,7 @@
#include <netinet/ip6.h> #include <netinet/ip6.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <sys/socket.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <net/if.h> #include <net/if.h>

View File

@ -8,6 +8,7 @@
#include <net/if_arp.h> #include <net/if_arp.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/if_infiniband.h> #include <linux/if_infiniband.h>

View File

@ -5,7 +5,9 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <errno.h> #include <errno.h>
#include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>

Some files were not shown because too many files have changed in this diff Show More