From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 Apr 2018 12:53:31 +0000 (+0200)
Subject: Merge pull request #8676 from keszybz/drop-license-boilerplate
X-Git-Tag: v239~421
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=4d09e1c8bab1d684172b1f277f3213825b30d2d9;p=systemd%2F.git

Merge pull request #8676 from keszybz/drop-license-boilerplate

Drop license boilerplate
---

4d09e1c8bab1d684172b1f277f3213825b30d2d9
diff --cc src/shared/sleep-config.h
index b91a4b2d26,987d81cf28..c1f381522a
--- a/src/shared/sleep-config.h
+++ b/src/shared/sleep-config.h
@@@ -5,27 -5,11 +5,14 @@@
    This file is part of systemd.
  
    Copyright 2013 Zbigniew Jędrzejewski-Szmek
- 
-   systemd is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
- 
-   systemd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   Lesser General Public License for more details.
- 
-   You should have received a copy of the GNU Lesser General Public License
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include <linux/fiemap.h>
  #include "time-util.h"
  
 +int read_fiemap(int fd, struct fiemap **ret);
  int parse_sleep_config(const char *verb, char ***modes, char ***states, usec_t *delay);
 +int find_hibernate_location(char **device, char **type, size_t *size, size_t *used);
  
  int can_sleep(const char *verb);
  int can_sleep_disk(char **types);
diff --cc src/sleep/sleep.c
index cee3f34593,b5acbdb4c4..9b310aaccf
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@@ -4,21 -4,7 +4,8 @@@
  
    Copyright 2012 Lennart Poettering
    Copyright 2013 Zbigniew Jędrzejewski-Szmek
 +  Copyright 2010-2017 Canonical
    Copyright 2018 Dell Inc.
- 
-   systemd is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
- 
-   systemd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   Lesser General Public License for more details.
- 
-   You should have received a copy of the GNU Lesser General Public License
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
  #include <errno.h>
diff --cc src/test/test-sleep.c
index 05fd6c0abf,21ca107478..f52aea447d
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@@ -3,25 -3,10 +3,12 @@@
    This file is part of systemd.
  
    Copyright 2012 Lennart Poettering
- 
-   systemd is free software; you can redistribute it and/or modify it
-   under the terms of the GNU Lesser General Public License as published by
-   the Free Software Foundation; either version 2.1 of the License, or
-   (at your option) any later version.
- 
-   systemd is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   Lesser General Public License for more details.
- 
-   You should have received a copy of the GNU Lesser General Public License
-   along with systemd; If not, see <http://www.gnu.org/licenses/>.
  ***/
  
 +#include <linux/fiemap.h>
  #include <stdio.h>
  
 +#include "fd-util.h"
  #include "log.h"
  #include "sleep-config.h"
  #include "strv.h"