more complete copyright notices

diff --git a/README b/README
index 5d8a7c22dc4bea0cfcf1552520e5aef600a323df..da28e4e2f0a0ef933f72cc0949055eb864e0c208 100644 (file)
--- a/README
+++ b/README
@@ -1,3 +1,20 @@
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 PXE install w multi-boot, btrfs & Libreboot support
 
 Some things are specific to my home network, and uses files with secrets

diff --git a/encrypt b/encrypt
index 89cc95f8bf7670d1b937b29ed58c785bf19b230a..9f80d34d58c10e8503e7b4e22edd78c302aa8a56 100644 (file)
--- a/encrypt
+++ b/encrypt
@@ -1,4 +1,11 @@
 #!/usr/bin/ash
+
+# This file is a modification of the file encrypt in cryptsetup package
+# in arch. The original version is encrypt.upstream in the repo at
+# https://iankelling.org/git/?p=automated-distro-installer. It did not
+# come with a license notice in the file, but I remember that it is
+# GPLv2-or-later.
+
 run_hook() {
     set -x
     echo $0

diff --git a/encrypt.upstream b/encrypt.upstream
index 819c4cf60fe05a15bf9238b3576c420e5919947b..39c8f168043e70549ec4567c52d5188c896a77d6 100644 (file)
--- a/encrypt.upstream
+++ b/encrypt.upstream
@@ -1,5 +1,9 @@
 #!/usr/bin/ash
 
+# This file is from the cryptsetup package in arch. The only
+# modification is this comment. It did not come with a license notice in
+# the file, but I remember that it is GPLv2-or-later.
+
 run_hook() {
     modprobe -a -q dm-crypt >/dev/null 2>&1
     [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"

diff --git a/fai/config/distro-install-common/devbyid b/fai/config/distro-install-common/devbyid
index af97643fd5753c44426252eea7dd7876f697cc53..733b8401e86dd092df93cc878e1f5fa78cb1cd3d 100755 (executable)
--- a/fai/config/distro-install-common/devbyid
+++ b/fai/config/distro-install-common/devbyid
@@ -1,4 +1,20 @@
 #!/bin/bash
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 # input eg: /dev/sda1 or /dev/sda
 # output: /dev/disk/by-id/model+serial, or if no link exists, the same as input

diff --git a/myfai-chboot b/myfai-chboot
index 308b1c70a04e317cb47e1aeacdefbc831d2c4426..743859abcf803d65c7495a4424de204ca94adf7f 100755 (executable)
--- a/myfai-chboot
+++ b/myfai-chboot
@@ -1,4 +1,20 @@
 #!/bin/bash
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR

diff --git a/myfai-chboot-local b/myfai-chboot-local
index c631d5699d073e6e27d9ccae8d8454cce7c2b8e5..4cef9a59638e22c06d718acd9dbf39fb4d39c68f 100755 (executable)
--- a/myfai-chboot-local
+++ b/myfai-chboot-local
@@ -1,4 +1,21 @@
 #!/bin/bash
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 # note, this script gets piped to bash, so cant cd to current dir
 
 [[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"

diff --git a/mymk-basefile b/mymk-basefile
index 3aef5b5cf592e5eccdc3be13fe0ded99db14486d..62f2924bfbb2431d13bff7ca8530accdb914fdca 100755 (executable)
--- a/mymk-basefile
+++ b/mymk-basefile
@@ -1,4 +1,20 @@
 #!/bin/bash
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 script_dir="${x%/*}"

diff --git a/wrt-init b/wrt-init
index c222a5c6e00576c9d58ce6797c88bd44767b6a6a..45425b6923817170ca920fb78a7985b217999893 100755 (executable)
--- a/wrt-init
+++ b/wrt-init
@@ -1,4 +1,21 @@
 #!/bin/sh
+# This file is part of Ian Kelling's automated-distro-installer
+# Copyright (C) 2024 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program 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 General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 set -xe
 # librecmc 1.5.1 is missing nfs-kernel-server and screen
 source /etc/os-release

diff --git a/wrt-setup-local b/wrt-setup-local
index d9f11ab9aac9701ef8dc22ebe50bfd8b8c630add..a5fd9118db2ee5b7c60087350c564ab7d51e4a4f 100755 (executable)
--- a/wrt-setup-local
+++ b/wrt-setup-local
@@ -876,7 +876,7 @@ config redirect
  option src              wan
  option src_dport        80
  option dest             lan
- option dest_ip          $l.12
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan
@@ -889,7 +889,7 @@ config redirect
  option src              wan
  option src_dport        443
  option dest             lan
- option dest_ip          $l.12
+ option dest_ip          $l.7
  option proto            tcp
 config rule
  option src              wan