Removed some obsolete "hints" files; added "interfaces" file; updates to svn:ignore
This commit is contained in:
frisco
parent
52d19f4ffe
commit
415e11745c
10 changed files with 26 additions and 183 deletions
14
README.devel
14
README.devel
|
|
@ -16,15 +16,6 @@ You may want to add the following line to apt-cacher's source list
|
|||
(for example, /etc/apt/sources.list) and run "aptitude update":
|
||||
deb http://systemausfall.org/toolforge/debian unstable main
|
||||
|
||||
The only files and folders relevant to this version are:
|
||||
tools/
|
||||
rm-tmps.sh
|
||||
config/
|
||||
Debian-Mirrors/
|
||||
README.devel.
|
||||
I'm keeping the folders from the legacy CryptoNAS build system around
|
||||
until I'm sure we don't need them. Don't be confused by their continued
|
||||
presence in the "deb-live" SVN branch.
|
||||
|
||||
config/chroot_local-includes/usr/lib/cryptobox-cd/etc.d/modules and
|
||||
config/chroot_local-includes/usr/lib/cryptobox-cd/etc.d/network/interfaces
|
||||
|
|
@ -52,10 +43,6 @@ A current list of mirrors is also located at
|
|||
TODO
|
||||
----
|
||||
|
||||
set up a firewall in the "secure" build
|
||||
|
||||
/etc/modules (make sure desired modules load at startup)
|
||||
|
||||
complete "cryptonas" name change
|
||||
|
||||
enable apache2 DAV
|
||||
|
|
@ -72,7 +59,6 @@ for release live cd, set an invalid hash to disable misusing the syslinux bootlo
|
|||
Short term goals:
|
||||
----------------
|
||||
do any more files need copyright notices?
|
||||
set up reasonable defaults in cnas-default-settings (use gedit with multiple separate windows)
|
||||
|
||||
|
||||
Known Issues:
|
||||
|
|
|
|||
|
|
@ -173,6 +173,12 @@ function configure_secure()
|
|||
# change some dir permissions
|
||||
chmod 770 /var/cache/cryptobox-server/settings/
|
||||
|
||||
# remove developer-specific script(s)
|
||||
rm -f /usr/share/cryptonas-live/devel-features.sh
|
||||
rm -f /etc/init.d/*devel-features
|
||||
rm -f /etc/rcS.d/*devel-features
|
||||
rm -f /etc/rc3.d/*devel-features
|
||||
|
||||
return 0
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,14 @@
|
|||
#
|
||||
# it should really NEVER be found on a release CD
|
||||
#
|
||||
##NOT currently called automatically in deb-live version
|
||||
#
|
||||
# NOT currently called automatically in deb-live version. You can
|
||||
# change this for your builds by creating a symbolic link
|
||||
# config/chroot_local-includes/etc/rc3.d/S90cnas-devel-features ==>
|
||||
# ==> /usr/share/cryptonas-live/devel-features.sh
|
||||
#
|
||||
# called by:
|
||||
# - /etc/init.d/S99cnas-devel-features
|
||||
# - /etc/init.d/S90cnas-devel-features
|
||||
#
|
||||
|
||||
set -eu
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
#CryptoNAS Live default /etc/network/interfaces
|
||||
#Set $CNAS_INTERFACES in config/cnas-custom-settings to override
|
||||
|
||||
|
||||
auto lo eth0
|
||||
iface lo inet loopback
|
||||
|
||||
|
||||
iface eth0 inet dhcp
|
||||
|
||||
#iface eth0 inet static
|
||||
# address 192.168.0.23
|
||||
# netmask 255.255.255.0
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
developer requirements:
|
||||
- dfsbuild
|
||||
- wget
|
||||
- curl
|
||||
- (qemu)
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
The current official debian package of dfsbuild (v0.99.2) is not working due
|
||||
to three ugly but small bugs.
|
||||
|
||||
If you are using dfsbuild v0.99.2, then you should do the following:
|
||||
- create a new directory and change into it
|
||||
- apt-get source dfsbuild
|
||||
- apply all dfsbuild-bug-?.patch files to the source directory
|
||||
- debuild -uc -us
|
||||
- install the freshly built package
|
||||
|
||||
Alternatively you could also install the patched version:
|
||||
packages/dfsbuild_0.99.2.1_i386.deb
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
as there is no debian-package for the perl bindings of clearsilver, you have to add it manually to the tree of the cbox-tree
|
||||
|
||||
1) download
|
||||
- get it from: http://www.clearsilver.net/downloads
|
||||
- unpack (tar xzf . ...)
|
||||
|
||||
|
||||
2) configuration
|
||||
./configure --disable-python --disable-ruby --disable-csharp --disable-apache --disable-java --disable-compression --enable-perl --enable-gettext --prefix=/tmp/clearsilver-perl
|
||||
|
||||
|
||||
3) fix a problem in scripts/document.py
|
||||
change the first line to "#!/usr/bin/env python"
|
||||
|
||||
|
||||
4) build it
|
||||
- make
|
||||
- make install
|
||||
|
||||
|
||||
5) cp to the cbox
|
||||
cp -a /tmp/clearsilver-perl/local/lib/perl/5.8.7/. cryptobox.conf.d/usr/lib/perl5
|
||||
rm cryptobox.conf.d/usr/lib/perl5/perllocal.pod
|
||||
|
||||
6) dependencies
|
||||
add python-clearsilver to the box (dfsbuild.conf)
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
## fixed bugs:
|
||||
## - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404563
|
||||
## - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=404555
|
||||
diff -ruN dfsbuild.orig/dfsbuild-0.99.2/Bootloader/Grub.hs dfsbuild/dfsbuild-0.99.2/Bootloader/Grub.hs
|
||||
--- dfsbuild.orig/dfsbuild-0.99.2/Bootloader/Grub.hs 2006-04-20 00:10:11.000000000 +0200
|
||||
+++ dfsbuild/dfsbuild-0.99.2/Bootloader/Grub.hs 2007-01-02 00:56:45.000000000 +0100
|
||||
@@ -40,8 +40,11 @@
|
||||
|
||||
grub_generic env =
|
||||
do createDirectory (targetdir env ++ "/boot/grub") 0o755
|
||||
- grubfiles <- glob "/lib/grub/*/*"
|
||||
- safeSystem "cp" $ ["-rv"] ++ grubfiles ++ [targetdir env ++ "/boot/grub/"]
|
||||
+ -- since etch (Debian 4.0) grub files are located in /usr/lib instead of /lib
|
||||
+ grubfiles_pre_etch <- glob "/lib/grub/*/*"
|
||||
+ grubfiles_since_etch <- glob "/usr/lib/grub/*/*"
|
||||
+ safeSystem "cp" $ ["-rv"] ++ grubfiles_pre_etch ++ grubfiles_since_etch ++
|
||||
+ [targetdir env ++ "/boot/grub/"]
|
||||
menuText <- grubMenu env
|
||||
writeFile (targetdir env ++ "/boot/grub/menu.lst") menuText
|
||||
|
||||
diff -ru dfsbuild.orig/dfsbuild-0.99.2/Actions/Mirror.hs dfsbuild/dfsbuild-0.99.2/Actions/Mirror.hs
|
||||
--- dfsbuild.orig/dfsbuild-0.99.2/Actions/Mirror.hs 2006-04-20 00:10:11.000000000 +0200
|
||||
+++ dfsbuild/dfsbuild-0.99.2/Actions/Mirror.hs 2007-01-01 22:09:26.000000000 +0100
|
||||
@@ -33,7 +33,7 @@
|
||||
archargs ++ debugargs ++ ["-d", suite, targetdir env, mirror]
|
||||
-- Next, copy them into the mirror.
|
||||
codename <- getCodeName
|
||||
- (targetdir env ++ "/var/cache/bootstrap/Release")
|
||||
+ (targetdir env ++ "/var/cache/bootstrap/")
|
||||
dm $ "Codename for this is " ++ codename
|
||||
mapM_ (\x -> handle (\_ -> return ()) (createDirectory x 0o755))
|
||||
[mirrordir, mirrordir ++ "/conf"]
|
||||
diff -ru dfsbuild.orig/dfsbuild-0.99.2/Utils.hs dfsbuild/dfsbuild-0.99.2/Utils.hs
|
||||
--- dfsbuild.orig/dfsbuild-0.99.2/Utils.hs 2006-04-20 00:10:11.000000000 +0200
|
||||
+++ dfsbuild/dfsbuild-0.99.2/Utils.hs 2007-01-01 22:40:34.000000000 +0100
|
||||
@@ -16,6 +16,7 @@
|
||||
import MissingH.ConfigParser
|
||||
import MissingH.Cmd
|
||||
import System.IO.Unsafe
|
||||
+import System.IO.Error
|
||||
import Text.Regex
|
||||
import MissingH.Path.FilePath
|
||||
import System.Directory(doesFileExist)
|
||||
@@ -72,7 +73,11 @@
|
||||
|
||||
getCodeName :: FilePath -> IO String
|
||||
getCodeName fp =
|
||||
- do c <- readFile fp
|
||||
+ do c_old <- System.IO.Error.catch (readFile (fp ++ "Release"))
|
||||
+ (\e -> if System.IO.Error.isDoesNotExistError e then return "" else ioError e)
|
||||
+ c_new <- System.IO.Error.catch (readFile (fp ++ "_dists_._Release"))
|
||||
+ (\e -> if System.IO.Error.isDoesNotExistError e then return "" else ioError e)
|
||||
+ c <- if length(c_old) > 0 then return c_old else return c_new
|
||||
let cr = mkRegex "Codename: ([a-z]+)"
|
||||
case matchRegex cr c of
|
||||
Just [cn] -> return cn
|
||||
|
|
@ -1,60 +0,0 @@
|
|||
## this patch allows the addition of custom scripts to prepare/cleanup the target
|
||||
## directory before/after package installation
|
||||
## it is necessary for the samba package as it requires /proc/ during installation
|
||||
--- dfsbuild.orig/dfsbuild-0.99.2/Actions.hs 2006-04-20 00:10:11.000000000 +0200
|
||||
+++ dfsbuild/dfsbuild-0.99.2/Actions.hs 2007-01-03 15:36:59.000000000 +0100
|
||||
@@ -43,6 +43,11 @@
|
||||
finished Bootstrapped
|
||||
Bootstrapped -> -- Time to install shared files
|
||||
do installlib env
|
||||
+ finished EnvironmentPrepared
|
||||
+ EnvironmentPrepared -> -- execute configurable hook scripts
|
||||
+ do im $ "Executing preparation scripts"
|
||||
+ mapM_ (safeSystem `flip` [ targetdir env ])
|
||||
+ (splitWs $ eget env "preparescripts")
|
||||
finished LibsInstalled
|
||||
LibsInstalled -> -- Install additional packages
|
||||
do installpkgs env
|
||||
@@ -68,6 +73,11 @@
|
||||
do safeSystem "mkcramfs" [(targetdir env) ++ "/opt/initrd",
|
||||
(targetdir env) ++ "/boot/initrd.dfs"]
|
||||
recursiveRemove SystemFS $ (targetdir env) ++ "/opt/initrd"
|
||||
+ finished EnvironmentCleaned
|
||||
+ EnvironmentCleaned -> -- execute configurable hook scripts
|
||||
+ do im $ "Executing preparation scripts"
|
||||
+ mapM_ (safeSystem `flip` [ targetdir env ])
|
||||
+ (splitWs $ eget env "cleanupscripts")
|
||||
finished RamdiskBuilt
|
||||
RamdiskBuilt -> -- Install the bootloader
|
||||
do (isoargs, blfunc) <- Bootloader.install env
|
||||
--- dfsbuild.orig/dfsbuild-0.99.2/Utils.hs 2007-01-01 23:06:17.000000000 +0100
|
||||
+++ dfsbuild/dfsbuild-0.99.2/Utils.hs 2007-01-03 15:33:00.000000000 +0100
|
||||
@@ -30,10 +31,10 @@
|
||||
marker :: String,
|
||||
datestr :: String}
|
||||
|
||||
-data DFSState = Fresh | Initialized | Mirrored | Bootstrapped | Installed
|
||||
- | LibsInstalled | DebsInstalled | CfgHandled | InitPrepped
|
||||
+data DFSState = Fresh | Initialized | Mirrored | Bootstrapped | EnvironmentPrepared
|
||||
+ | Installed | LibsInstalled | DebsInstalled | CfgHandled | InitPrepped
|
||||
| RDPrepped
|
||||
- | KernelsInstalled | RamdiskBuilt | BootloaderInstalled
|
||||
+ | KernelsInstalled | EnvironmentCleaned | RamdiskBuilt | BootloaderInstalled
|
||||
deriving (Eq, Show, Read, Ord)
|
||||
|
||||
im = infoM "dfs"
|
||||
--- dfsbuild.orig/dfsbuild-0.99.2/dfs.cfg 2006-07-02 01:46:22.000000000 +0200
|
||||
+++ dfsbuild/dfsbuild-0.99.2/dfs.cfg 2007-01-03 15:40:22.000000000 +0100
|
||||
@@ -115,6 +115,12 @@
|
||||
/var/log/dpkg.log
|
||||
/var/log/bootstrap.log
|
||||
|
||||
+# Scripts that should be executed after bootstrapping and before package installation
|
||||
+#preparescripts =
|
||||
+
|
||||
+# Scripts that should be executed after package installation and before iso generation
|
||||
+#cleanupscripts =
|
||||
+
|
||||
######################################################################
|
||||
# Arch settings: i386
|
||||
######################################################################
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
# sample startup file for running the cryptobox in a user-mode-linux environment
|
||||
#
|
||||
# it does not work, as the dfsbuild-cd-image is not being recognized during boot
|
||||
#
|
||||
# just as a reminder ...
|
||||
#
|
||||
kernel/uml-kernel-2.6.12.3-cryptobox dfscd=/dev/ubd1 ubd1r=_builddir/cd1/image.iso ubd0=_builddir/cd1/image-working/opt/dfsruntime/initrd.dfs con=null con0=fd:0,fd:1
|
||||
Loading…
Reference in a new issue