Merge branch 'release/0.1.3'

Author: kartoch

Makefile.am

@@ -1,7 +1,8 @@
+NETKIT_BUILD_RELEASE=0.1.3
 NETKIT_KERNEL_RELEASE=K3.2
 NETKIT_FS_RELEASE=F7.0
 
 SUBARCH=i386
 
-KERNEL_ARCHIVE_FILE=netkit-ng-kernel-${SUBARCH}-${NETKIT_KERNEL_RELEASE}.tar.bz2
-FS_ARCHIVE_FILE=netkit-ng-filesystem-${SUBARCH}-${NETKIT_FS_RELEASE}.tar.bz2
+KERNEL_ARCHIVE_FILE=netkit-ng-kernel-${SUBARCH}-${NETKIT_KERNEL_RELEASE}-${NETKIT_BUILD_RELEASE}.tar.bz2
+FS_ARCHIVE_FILE=netkit-ng-filesystem-${SUBARCH}-${NETKIT_FS_RELEASE}-${NETKIT_BUILD_RELEASE}.tar.bz2

README.mdown

@@ -1,71 +1,3 @@
-# Netkit UML build
+Netkit-NG kernel and fs build version 0.1.3
 
-## Introduction
-
-Netkit development has stalled since some time and the scripts to build the fs
-and the kernel are now broken due to a bug in deboostrap which is not going to
-be fixed (the fs is based on the now deprecated debian Sid).
-
-This project proposes a generic way to build and expand kernel and image for
-Netkit, levering build tools in debian. More specifically:
-
-- kernel is build from source using debian package and patched with netkit
-  patchs.
-- rootstrap builds the fs with new modules dedicated to netkit.
-
-At the present time:
-- only wheezy is supported.
-- only i386 kernel and fs builds are supported.
-
-## Warning
-
-The kernel and the fs ONLY work with a modified version of `netkit-core`.
-
-## Installation
-
-The build is developped and tested on debian Wheezy.
-
-It is recommanded to use a non-critical virtual machine, as the build script
-requires root user.
-
-The build requires several tools which can be installed with the following
-commands (using root user):
-
-    apt-get install build-essentials rootstrap
-
-Launch the build with the command make in the root directory of the project.
-
-
-
-## Configuration
-
-The following files can help an user to configure the build:
-
-- `fs/filesystem-tweaks/` directory contains files which are copied in the fs.
-- `fs/disabled-services` desactivates `/etc/init.d` scripts in the fs.
-- `fs/packages-list` lists the packages to installed in the fs.
-- `fs/debconf-package-selections` contains the configuration applied to the 
-  packages.
-- `fs/packages-list` lists the packages to installed in the fs.
-- `kernel/config.i386` is the configuration of the kernel.
-- `kernel/patches/` directory contains the patches applied before kernel
-  build.
-
-## Bug
-
-* The filesystem uses the sparse mode. On encrypted partition, the disk access can be very slow (very!).
-
-## History
-
-#### Version 0.1.2
-
-* networking init.d script is enabled at startup
-
-#### Version 0.1.1
-
-* install directory is now 'netkit-ng'
-* add lxc and openswan
-
-#### Version 0.1
-
-* first official stable release
+Documentations are located here: http://netkit-ng.github.io/

fs/debconf-package-selections

@@ -6,6 +6,7 @@ dbus
 dnsmasq
 ebtables
 freeradius
+ipsec
 lvm2
 lxc
 mrd6
@@ -24,3 +25,5 @@ snmpd
 squid
 ssh
 x11-common
+xl2tpd
+

fs/disabled-services

@@ -0,0 +1,5 @@
+# Secrets for authentication using CHAP
+# client        server  secret                  IP addresses
+
+
+

fs/filesystem-tweaks/etc/ppp/chap-secrets

@@ -0,0 +1,44 @@
+#
+# /etc/ppp/pap-secrets
+#
+# This is a pap-secrets file to be used with the AUTO_PPP function of
+# mgetty. mgetty-0.99 is preconfigured to startup pppd with the login option
+# which will cause pppd to consult /etc/passwd (and /etc/shadow in turn)
+# after a user has passed this file. Don't be disturbed therefore by the fact
+# that this file defines logins with any password for users. /etc/passwd
+# (again, /etc/shadow, too) will catch passwd mismatches.
+#
+# This file should block ALL users that should not be able to do AUTO_PPP.
+# AUTO_PPP bypasses the usual login program so it's necessary to list all
+# system userids with regular passwords here.
+#
+# ATTENTION: The definitions here can allow users to login without a
+# password if you don't use the login option of pppd! The mgetty Debian
+# package already provides this option; make sure you don't change that.
+
+# INBOUND connections
+
+# Every regular user can use PPP and has to use passwords from /etc/passwd
+*       hostname        ""      *
+
+# UserIDs that cannot use PPP at all. Check your /etc/passwd and add any
+# other accounts that should not be able to use pppd!
+guest   hostname        "*"     -
+master  hostname        "*"     -
+root    hostname        "*"     -
+support hostname        "*"     -
+stats   hostname        "*"     -
+
+# OUTBOUND connections
+
+# Here you should add your userid password to connect to your providers via
+# PAP. The * means that the password is to be used for ANY host you connect
+# to. Thus you do not have to worry about the foreign machine name. Just
+# replace password with your password.
+# If you have different providers with different passwords then you better
+# remove the following line.
+
+#-HOSTNAME-     *       password
+
+
+

fs/filesystem-tweaks/etc/ppp/pap-secrets

@@ -25,6 +25,11 @@ chroot $TARGET mount -t proc proc /proc
 # load debconf-package-selections
 cat $WORKDIR/debconf-package-selections | chroot $TARGET debconf-set-selections
 
+# fix ppp install error: install dummy files
+mkdir -p $TARGET/etc/ppp/
+cp $WORKDIR/filesystem-tweaks/etc/ppp/chap-secrets $TARGET/etc/ppp/chap-secrets
+cp $WORKDIR/filesystem-tweaks/etc/ppp/pap-secrets $TARGET/etc/ppp/pap-secrets
+
 # install packages in packages-list
 if test "$install" = "true"; then
     packages_list=`cat $WORKDIR/packages-list | grep -v '#'`

fs/modules/netkit

@@ -12,6 +12,7 @@ bzip2
 console-common
 console-data
 console-tools
+curl
 dnsmasq
 dnsutils
 ebtables
@@ -46,9 +47,11 @@ nmap
 openssh-client
 openssh-server
 openssl
-openswan
+strongswan
 openvpn
 pdns-recursor
+ppp
+pppoe
 proftpd-basic
 psmisc
 python
@@ -80,8 +83,7 @@ tshark
 ucarp
 vim
 vlan
+xl2tpd
 zsh
 # smcroute -- removed because of smcroute conflict
 # pimd -- removed because of pimd conflict
-# ppp -- error during configuration
-# pppoe -- error during configuration