[PATCH 1/2] 10i18n: exit if console already initialized

[PATCH 1/2] 10i18n: exit if console already initialized

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 651 bytes --]


---
 modules.d/10i18n/console_init |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
index fa74595..0d4fa8f 100755
--- a/modules.d/10i18n/console_init
+++ b/modules.d/10i18n/console_init
@@ -63,12 +63,15 @@ dev_open() {
 
 
 dev=/dev/${1#/dev/}
+devname=${dev#/dev/}
 
 [ -c "${dev}" ] || {
     echo "Usage: $0 device" >&2
     exit 1
 }
 
+[ -e /tmp/console_init.${devname} ] && exit 0
+
 dev_open ${dev}
 
 for fd in 6 7; do
@@ -85,3 +88,4 @@ set_font ${dev}
 set_keymap
 
 dev_close
+>/tmp/console_init.${devname}
-- 
1.7.1.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

[PATCH 2/2] 99base: no modprobe and rmmod if --no-kernel

[Amadeusz Żołnowski]

[-- Attachment #1: Type: text/plain, Size: 1482 bytes --]

If we build initramfs without modules, instead of adding modprobe and
rmmod, create symlinks to /bin/true to don't produce unnecessary errors.
Anyway it's a workaround for following desired behaviour:
modprobe tries to insert module only if it's not built into kernel
---
 modules.d/99base/install |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules.d/99base/install b/modules.d/99base/install
index 6ba9e7e..0fd84ed 100755
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -1,6 +1,13 @@
 #!/bin/bash
-dracut_install mount mknod mkdir modprobe pidof sleep chroot \
-    sed ls flock cp mv dmesg rm ln rmmod mkfifo less 
+dracut_install mount mknod mkdir pidof sleep chroot \
+    sed ls flock cp mv dmesg rm ln mkfifo less
+if [[ $no_kernel ]]; then
+    inst /bin/true
+    ln -s /bin/true "${initdir}"/sbin/modprobe
+    ln -s /bin/true "${initdir}"/sbin/rmmod
+else
+    dracut_install modprobe rmmod
+fi
 if [ ! -e "${initdir}/bin/sh" ]; then
     dracut_install bash
     (ln -s bash "${initdir}/bin/sh" || :)
@@ -18,7 +25,7 @@ if which switch_root >/dev/null 2>&1; then
     dracut_install switch_root 
 else
     inst "$moddir/switch_root" "/sbin/switch_root" \
-	|| derror "Failed to install switch_root"
+            || derror "Failed to install switch_root"
 fi
 inst "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
 inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
-- 
1.7.1.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH 1/2] 10i18n: exit if console already initialized

[Harald Hoyer]

pushed

On 07/26/2010 10:15 AM, Amadeusz Żołnowski wrote:
>
> ---
>   modules.d/10i18n/console_init |    4 ++++
>   1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/modules.d/10i18n/console_init b/modules.d/10i18n/console_init
> index fa74595..0d4fa8f 100755
> --- a/modules.d/10i18n/console_init
> +++ b/modules.d/10i18n/console_init
> @@ -63,12 +63,15 @@ dev_open() {
>
>
>   dev=/dev/${1#/dev/}
> +devname=${dev#/dev/}
>
>   [ -c "${dev}" ] || {
>       echo "Usage: $0 device">&2
>       exit 1
>   }
>
> +[ -e /tmp/console_init.${devname} ]&&  exit 0
> +
>   dev_open ${dev}
>
>   for fd in 6 7; do
> @@ -85,3 +88,4 @@ set_font ${dev}
>   set_keymap
>
>   dev_close
> +>/tmp/console_init.${devname}