summaryrefslogtreecommitdiff
path: root/src/import
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2020-11-09 13:23:58 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2020-11-09 13:23:58 +0900
commitdb9ecf050165fd1033c6f81485917e229c4be537 (patch)
tree68a1e401823fc90fddae82e8858738b026ab8f89 /src/import
parent21d8f2533db7c46b80f74bd147869eb4f10195a6 (diff)
downloadsystemd-db9ecf050165fd1033c6f81485917e229c4be537.tar.gz
license: LGPL-2.1+ -> LGPL-2.1-or-later
Diffstat (limited to 'src/import')
-rw-r--r--src/import/curl-util.c2
-rw-r--r--src/import/curl-util.h2
-rw-r--r--src/import/export-raw.c2
-rw-r--r--src/import/export-raw.h2
-rw-r--r--src/import/export-tar.c2
-rw-r--r--src/import/export-tar.h2
-rw-r--r--src/import/export.c2
-rw-r--r--src/import/import-common.c2
-rw-r--r--src/import/import-common.h2
-rw-r--r--src/import/import-compress.c2
-rw-r--r--src/import/import-compress.h2
-rw-r--r--src/import/import-fs.c2
-rw-r--r--src/import/import-raw.c2
-rw-r--r--src/import/import-raw.h2
-rw-r--r--src/import/import-tar.c2
-rw-r--r--src/import/import-tar.h2
-rw-r--r--src/import/import.c2
-rw-r--r--src/import/importd.c2
-rw-r--r--src/import/meson.build2
-rw-r--r--src/import/org.freedesktop.import1.conf2
-rw-r--r--src/import/org.freedesktop.import1.policy2
-rw-r--r--src/import/org.freedesktop.import1.service2
-rw-r--r--src/import/pull-common.c2
-rw-r--r--src/import/pull-common.h2
-rw-r--r--src/import/pull-job.c2
-rw-r--r--src/import/pull-job.h2
-rw-r--r--src/import/pull-raw.c2
-rw-r--r--src/import/pull-raw.h2
-rw-r--r--src/import/pull-tar.c2
-rw-r--r--src/import/pull-tar.h2
-rw-r--r--src/import/pull.c2
-rw-r--r--src/import/qcow2-util.c2
-rw-r--r--src/import/qcow2-util.h2
-rw-r--r--src/import/test-qcow2.c2
34 files changed, 34 insertions, 34 deletions
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
index a1b3147f65..bb81f97b09 100644
--- a/src/import/curl-util.c
+++ b/src/import/curl-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
diff --git a/src/import/curl-util.h b/src/import/curl-util.h
index fa80b23342..f4a882d234 100644
--- a/src/import/curl-util.h
+++ b/src/import/curl-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <curl/curl.h>
diff --git a/src/import/export-raw.c b/src/import/export-raw.c
index a0ac6bc7f4..3e0348f4c1 100644
--- a/src/import/export-raw.c
+++ b/src/import/export-raw.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/sendfile.h>
diff --git a/src/import/export-raw.h b/src/import/export-raw.h
index 196b8ef28f..27009e4e35 100644
--- a/src/import/export-raw.h
+++ b/src/import/export-raw.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/import/export-tar.c b/src/import/export-tar.c
index 5f89880ed6..b8b650f01e 100644
--- a/src/import/export-tar.c
+++ b/src/import/export-tar.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "sd-daemon.h"
diff --git a/src/import/export-tar.h b/src/import/export-tar.h
index 6abb7d383a..3b55d12c1f 100644
--- a/src/import/export-tar.h
+++ b/src/import/export-tar.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/import/export.c b/src/import/export.c
index 77d24b8635..83990df64c 100644
--- a/src/import/export.c
+++ b/src/import/export.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <locale.h>
diff --git a/src/import/import-common.c b/src/import/import-common.c
index ebd7472892..250270511d 100644
--- a/src/import/import-common.c
+++ b/src/import/import-common.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sched.h>
#include <sys/prctl.h>
diff --git a/src/import/import-common.h b/src/import/import-common.h
index 94d224f412..b27a980839 100644
--- a/src/import/import-common.h
+++ b/src/import/import-common.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <sys/types.h>
diff --git a/src/import/import-compress.c b/src/import/import-compress.c
index 3fbd067790..b89ffb1b2a 100644
--- a/src/import/import-compress.c
+++ b/src/import/import-compress.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include "import-compress.h"
#include "string-table.h"
diff --git a/src/import/import-compress.h b/src/import/import-compress.h
index 859bd0e1a4..e40f4dba0a 100644
--- a/src/import/import-compress.h
+++ b/src/import/import-compress.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#if HAVE_BZIP2
diff --git a/src/import/import-fs.c b/src/import/import-fs.c
index f631f857fc..3b43ea112d 100644
--- a/src/import/import-fs.c
+++ b/src/import/import-fs.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <locale.h>
diff --git a/src/import/import-raw.c b/src/import/import-raw.c
index 7e9f3441f4..9f5c13ba16 100644
--- a/src/import/import-raw.c
+++ b/src/import/import-raw.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/fs.h>
diff --git a/src/import/import-raw.h b/src/import/import-raw.h
index de4c3ea337..4612a9ffef 100644
--- a/src/import/import-raw.h
+++ b/src/import/import-raw.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/import/import-tar.c b/src/import/import-tar.c
index 5d2bf22fb2..9f68d45eac 100644
--- a/src/import/import-tar.c
+++ b/src/import/import-tar.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <linux/fs.h>
diff --git a/src/import/import-tar.h b/src/import/import-tar.h
index 347f522614..afbe98ad05 100644
--- a/src/import/import-tar.h
+++ b/src/import/import-tar.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/import/import.c b/src/import/import.c
index 64ec066a8f..eade0f0ec8 100644
--- a/src/import/import.c
+++ b/src/import/import.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <locale.h>
diff --git a/src/import/importd.c b/src/import/importd.c
index 17944b8dd3..63f80e0e38 100644
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/prctl.h>
#include <sys/wait.h>
diff --git a/src/import/meson.build b/src/import/meson.build
index 1c15fd883f..2207b8620e 100644
--- a/src/import/meson.build
+++ b/src/import/meson.build
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
systemd_importd_sources = files('''
importd.c
diff --git a/src/import/org.freedesktop.import1.conf b/src/import/org.freedesktop.import1.conf
index 2fdb2ba77c..4838e79a15 100644
--- a/src/import/org.freedesktop.import1.conf
+++ b/src/import/org.freedesktop.import1.conf
@@ -3,7 +3,7 @@
"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
<!--
- SPDX-License-Identifier: LGPL-2.1+
+ SPDX-License-Identifier: LGPL-2.1-or-later
This file is part of systemd.
diff --git a/src/import/org.freedesktop.import1.policy b/src/import/org.freedesktop.import1.policy
index beea5fea67..9736816e33 100644
--- a/src/import/org.freedesktop.import1.policy
+++ b/src/import/org.freedesktop.import1.policy
@@ -3,7 +3,7 @@
"http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd">
<!--
- SPDX-License-Identifier: LGPL-2.1+
+ SPDX-License-Identifier: LGPL-2.1-or-later
This file is part of systemd.
diff --git a/src/import/org.freedesktop.import1.service b/src/import/org.freedesktop.import1.service
index 34d26d0732..4fe921f26e 100644
--- a/src/import/org.freedesktop.import1.service
+++ b/src/import/org.freedesktop.import1.service
@@ -1,4 +1,4 @@
-# SPDX-License-Identifier: LGPL-2.1+
+# SPDX-License-Identifier: LGPL-2.1-or-later
#
# This file is part of systemd.
#
diff --git a/src/import/pull-common.c b/src/import/pull-common.c
index fdc70447e1..33be609aec 100644
--- a/src/import/pull-common.c
+++ b/src/import/pull-common.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <sys/prctl.h>
diff --git a/src/import/pull-common.h b/src/import/pull-common.h
index 65f239da2e..025bcee2bd 100644
--- a/src/import/pull-common.h
+++ b/src/import/pull-common.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <stdbool.h>
diff --git a/src/import/pull-job.c b/src/import/pull-job.c
index 4561794548..eea00380a4 100644
--- a/src/import/pull-job.c
+++ b/src/import/pull-job.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/src/import/pull-job.h b/src/import/pull-job.h
index c907e74060..719196caec 100644
--- a/src/import/pull-job.h
+++ b/src/import/pull-job.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include <gcrypt.h>
diff --git a/src/import/pull-raw.c b/src/import/pull-raw.c
index c32b77f14b..7956ef0395 100644
--- a/src/import/pull-raw.c
+++ b/src/import/pull-raw.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <curl/curl.h>
#include <linux/fs.h>
diff --git a/src/import/pull-raw.h b/src/import/pull-raw.h
index 4ccd65b7e6..e1d450d9df 100644
--- a/src/import/pull-raw.h
+++ b/src/import/pull-raw.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/import/pull-tar.c b/src/import/pull-tar.c
index ede28bee1b..72e5b8be27 100644
--- a/src/import/pull-tar.c
+++ b/src/import/pull-tar.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <curl/curl.h>
#include <sys/prctl.h>
diff --git a/src/import/pull-tar.h b/src/import/pull-tar.h
index 76f920eea9..78d982cf5a 100644
--- a/src/import/pull-tar.h
+++ b/src/import/pull-tar.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "sd-event.h"
diff --git a/src/import/pull.c b/src/import/pull.c
index 9b27ec2630..9aff377b93 100644
--- a/src/import/pull.c
+++ b/src/import/pull.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <getopt.h>
#include <locale.h>
diff --git a/src/import/qcow2-util.c b/src/import/qcow2-util.c
index e927b60fce..5a7232d3ed 100644
--- a/src/import/qcow2-util.c
+++ b/src/import/qcow2-util.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <zlib.h>
diff --git a/src/import/qcow2-util.h b/src/import/qcow2-util.h
index 7393d9837a..f17c159ee4 100644
--- a/src/import/qcow2-util.h
+++ b/src/import/qcow2-util.h
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
int qcow2_detect(int fd);
diff --git a/src/import/test-qcow2.c b/src/import/test-qcow2.c
index 1703cfd167..77fed01dd3 100644
--- a/src/import/test-qcow2.c
+++ b/src/import/test-qcow2.c
@@ -1,4 +1,4 @@
-/* SPDX-License-Identifier: LGPL-2.1+ */
+/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <fcntl.h>
#include <sys/stat.h>