fai.diff discussion - fai package for Ubuntu 8.10 (both server and client)

Adrian Gibanel Lopez agibanel at alumnes.udl.cat
Wed Jan 14 21:20:50 CET 2009


> diff -urN original/conf/make-fai-nfsroot.conf
modificado/conf/make-fai-nfsroot.conf
> --- original/conf/make-fai-nfsroot.conf	2008-12-30 22:10:10.000000000 +0100
> +++ modificado/conf/make-fai-nfsroot.conf	2009-01-08 15:53:47.000000000
+0100
> @@ -12,7 +12,8 @@
>  # on the clients. This line(s) will be added to $nfsroot/etc/hosts.
>  #NFSROOT_ETC_HOSTS="192.168.1.250 yourinstallserver"
>
> -FAI_DEBOOTSTRAP="hardy http://archive.ubuntu.com/ubuntu"
> +#FAI_DEBOOTSTRAP="hardy http://archive.ubuntu.com/ubuntu"
> +FAI_DEBOOTSTRAP="intrepid
file:/home/ubuntu_mirrors/us.archive.ubuntu.com/ubuntu"
I need to fix this. I meant, of course:
FAI_DEBOOTSTRAP="intrepid http://archive.ubuntu.com/ubuntu"
>
>  # the encrypted (with md5 or crypt) root password on all install
clients during
>  # installation process; used when log in via ssh; default pw is: fai
> @@ -24,9 +25,9 @@
>
>  # directory of hooks to be sourced at the end of make-fai-nfsroot,
>  # i.e they have to be shell scripts.
> -#NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
> +NFSROOT_HOOKS=/etc/fai/nfsroot-hooks/
In my opinion if a nfsroot-hooks file was created is meant to be sourced.
I have not checked if it works without the file. I remember that some
read-write errors happened because of unionfs filesystem this is why I
included this by default.
>
>  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
>  # following lines should be read only for most of you
>
> -FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info"
> +FAI_DEBOOTSTRAP_OPTS="--exclude=dhcp-client,info
--include=language-pack-en-base,aptitude,fontconfig,defoma,anthy,belocs-locales-bin"
This avoids the perl warning errors and many others, taken from Achim.

> diff -urN original/conf/sources.list modificado/conf/sources.list
> --- original/conf/sources.list	2008-12-30 22:10:10.000000000 +0100
> +++ modificado/conf/sources.list	2008-12-30 22:38:32.000000000 +0100
> @@ -1,12 +1,12 @@
> -# These lines should work for installations of ubuntu hardy
> +# These lines should work for installations of ubuntu intrepid
>  # please adapt the following entries if you are using another distribution
>  # make sure that a recent version of live-initramfs is available
>  # (e.g. feisty doesn't ship live-initramfs at all, therefore the ppa is
needed!)
>  # A more comprehensive example is at /usr/share/doc/fai-doc/examples/etc
>
>
> -deb http://archive.ubuntu.com/ubuntu    hardy main restricted universe
multiverse
> -deb http://security.ubuntu.com/ubuntu   hardy-security main restricted
universe multiverse
> +deb http://archive.ubuntu.com/ubuntu    intrepid main restricted
universe multiverse
> +deb http://security.ubuntu.com/ubuntu   intrepid-security main
restricted universe multiverse
>
> -deb http://ppa.launchpad.net/fai/ubuntu hardy main restricted universe
multiverse
> +deb http://ppa.launchpad.net/fai/ubuntu intrepid main restricted
universe multiverse
>
> diff -urN original/debian/changelog modificado/debian/changelog
> --- original/debian/changelog	2008-12-30 22:10:10.000000000 +0100
> +++ modificado/debian/changelog	2009-01-06 23:05:04.000000000 +0100
> @@ -1,3 +1,9 @@
> +fai (3.2.4+svn4838-0ubuntu2) intrepid; urgency=low
> +
> +  * Updated fai for serving Ubuntu intrepid
How can I improve this (I am not very good at English)?
> +
> + -- Adrian Gibanel <adrian.gibanel.lopez at gmail.com>  Tue, 06 Jan 2009
11:05:34 +0200
> +
>  fai (3.2.4+svn4837-0ubuntu2) hardy; urgency=low
>
>    * upload to hardy
> diff -urN original/debian/.directory modificado/debian/.directory
> --- original/debian/.directory	1970-01-01 01:00:00.000000000 +0100
> +++ modificado/debian/.directory	2008-12-30 22:54:58.000000000 +0100
> @@ -0,0 +1,3 @@
> +[Dolphin]
> +Timestamp=2008,12,30,22,54,58
> +ViewMode=1
I thought I had removed this. I am sorry.
> diff -urN original/debian/fai-server.dirs modificado/debian/fai-server.dirs
> --- original/debian/fai-server.dirs	2008-02-14 10:49:35.000000000 +0100
> +++ modificado/debian/fai-server.dirs	2008-12-30 23:17:01.000000000 +0100
> @@ -4,3 +4,4 @@
>  usr/bin
>  usr/sbin
>  usr/share/fai/pixmaps
> +etc/fai/nfsroot-hooks
I suppose that it was needed to edit this file although I am not expert on
Debian packages.
> diff -urN original/debian/fai-server.install
modificado/debian/fai-server.install
> --- original/debian/fai-server.install	2008-02-14 10:49:35.000000000 +0100
> +++ modificado/debian/fai-server.install	2008-12-30 23:02:28.000000000
+0100
> @@ -12,3 +12,4 @@
>  etc/fai/NFSROOT
>  etc/fai/apt/sources.list
>  etc/fai/make-fai-nfsroot.conf
> +etc/fai/nfsroot-hooks/10-unionfs-workaround
Unionfs patch. Commented above.
> diff -urN original/examples/simple/hooks/faiend.FAIBASE.source
modificado/examples/simple/hooks/faiend.FAIBASE.source
> --- original/examples/simple/hooks/faiend.FAIBASE.source	1970-01-01
01:00:00.000000000 +0100
> +++ modificado/examples/simple/hooks/faiend.FAIBASE.source	2009-01-06
20:06:41.000000000 +0100
> @@ -0,0 +1,20 @@
> +#! /bin/bash
> +
> +# Create /var/lock and /var/run in / folder.
> +#
> +# TODO: If folders do exist do not create them.
> +
> +VAR_MOUNT_TEMPORAL_FOLDER="/mnt/tmp"
> +VAR_LOCK="/var/lock"
> +VAR_RUN="/var/run"
> +TARGET_FOLDER="/target"
> +
> +mkdir ${VAR_MOUNT_TEMPORAL_FOLDER}
> +mount -o bind ${TARGET_FOLDER} ${VAR_MOUNT_TEMPORAL_FOLDER}
> +mkdir -p ${VAR_MOUNT_TEMPORAL_FOLDER}${VAR_RUN}
> +mkdir -p ${VAR_MOUNT_TEMPORAL_FOLDER}${VAR_LOCK}
> +umount ${VAR_MOUNT_TEMPORAL_FOLDER}
> +rmdir  ${VAR_MOUNT_TEMPORAL_FOLDER}
> +sync
> +echo "/var/lock and /var/run creation - END"
> +
This is the hook so that the system does not complain about not having a
/var/lock and a /var/run mount point at normal boot.
Does any one know about a better fix?


Well, that's all. As always any comment is welcome.
-- 
Firma Automática 1:
---------------------
Adrian Gibanel Lopez
Estudiante de Ingenieria de Informatica de Sistemas en la Universitat de
LLeida.
Firma Automática 2:
---------------------
Participante en el III Concurso Universitario de Software Libre.
Proyecto: Desdeslin. http://desdeslin.wordpress.com


More information about the linux-fai mailing list