Relicensed to Simplified BSD, dmsetup now only required when LUKS is …

…used

CHANGES

@@ -1,3 +1,8 @@
+6.1.3
+------------
+- Relicensed to the Simplified BSD License
+- 'dmsetup' will only be copied when LUKS is used.
+
 6.1.2
 ------------
 - Relicensed back to MPL 2.0

README

@@ -1,8 +1,8 @@
-Bliss Initramfs Creator - v6.1.2
+Bliss Initramfs Creator - v6.1.3
 Jonathan Vasquez <[email protected]>
 Designed for Gentoo Linux
 
-Distributed under the MPL 2.0 which can be found in the LICENSE file.
+Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 This script generates an initramfs image with all the included files and
 dependencies needed to mount your filesystem.

files/init

@@ -1,10 +1,7 @@
 #!/bin/bash
 
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 # ========== Variables ==========
 _use_zfs=0

mkinitrd.py

@@ -1,10 +1,7 @@
 #!/usr/bin/env python3
 
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from subprocess import call
 

pkg/hooks/Addon.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.hooks.Hook import Hook
 

pkg/hooks/Base.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.hooks.Hook import Hook
 from pkg.libs.Tools import Tools

pkg/hooks/Firmware.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.hooks.Hook import Hook
 

pkg/hooks/Hook.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.libs.Tools import Tools
 

pkg/hooks/Luks.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.hooks.Hook import Hook
 
@@ -13,4 +10,9 @@ class Luks(Hook):
         "/usr/bin/gpg",
         "/usr/bin/gpg-agent",
         "/usr/share/gnupg/gpg-conf.skel",
+
+        # Used for udev cookie release when cryptsetup announces udev support
+        # and attempts to decrypt the drive. Without this, the cryptsetup will lock up
+        # and stay at "waiting for zero"
+        "/sbin/dmsetup",
     ]

pkg/hooks/Udev.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.hooks.Hook import Hook
 from pkg.libs.Tools import Tools
@@ -16,9 +13,4 @@ class Udev(Hook):
         # udev
         Tools.GetUdevPath(),
         Tools.GetProgramPath("udevadm"),
-
-        # Used for udev cookie release when cryptsetup announces udev support
-        # and attempts to decrypt the drive. Without this, the cryptsetup will lock up
-        # and stay at "waiting for zero"
-        "/sbin/dmsetup",
     ]

pkg/hooks/Zfs.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 from pkg.hooks.Hook import Hook
 

pkg/libs/Core.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 import os
 import shutil

pkg/libs/Tools.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 import os
 import shutil
@@ -43,7 +40,7 @@ def PrintHeader(cls):
         cls.Print(cls.Colorize("yellow", "----------------------------------"))
         cls.Print(cls.Colorize("yellow", var.name + " - v" + var.version))
         cls.Print(cls.Colorize("yellow", var.contact))
-        cls.Print(cls.Colorize("yellow", "Distributed under the " + var.license))
+        cls.Print(cls.Colorize("yellow", "Licensed under the " + var.license))
         cls.Print(cls.Colorize("yellow", "----------------------------------") + "\n")
 
     # Prints the available options

pkg/libs/Variables.py

@@ -1,8 +1,5 @@
 # Copyright 2012-2015 Jonathan Vasquez <[email protected]>
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# Licensed under the Simplified BSD License which can be found in the LICENSE file.
 
 import os
 import subprocess
@@ -14,8 +11,8 @@
 author = "Jonathan Vasquez"
 email = "[email protected]"
 contact = author + " <" + email + ">"
-version = "6.1.2"
-license = "MPL 2.0"
+version = "6.1.3"
+license = "Simplified BSD License"
 
 # Locations
 home = os.getcwd()
@@ -86,9 +83,9 @@
 ]
 
 # Line numbers in the 'init' script where sed will substitute its values in
-useZfsLine = "10"
-useLuksLine = "11"
-useAddonLine = "12"
-useUdevLine = "13"
-initrdVersionLine = "15"
-addonModulesLine = "38"
+useZfsLine = "7"
+useLuksLine = "8"
+useAddonLine = "9"
+useUdevLine = "10"
+initrdVersionLine = "12"
+addonModulesLine = "35"