[Lunar-commits] <moonbase-core> dracut: Version 024 + lunar-live module

[Peter de Ridder]

commit 4397aa3fd0b01b223337c9c925e53360118613b8
Author: Peter de Ridder <peter at lunar-linux.org>
Date: Sun, 23 Dec 2012 12:23:22 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/4397aa3fd0b01b223337c9c925e53360118613b8

dracut: Version 024 + lunar-live module
---
  kernel/dracut/BUILD                                 | +5/-2     
  kernel/dracut/DEPENDS                               | +1/-0     
  kernel/dracut/DETAILS                               | +3/-3     
  kernel/dracut/dracut.d/90lunar-live/module-setup.sh | +16/-0    
  4 files changed, 25 insertions(+), 5 deletions(-)

--- a/kernel/dracut/BUILD
+++ b/kernel/dracut/BUILD
@@ -1,9 +1,9 @@
 (
 
   patch_it $SOURCE2 1 &&
+  sedit 's:dash:bash:' Makefile &&
 
-  prepare_install &&
-  make prefix=/usr sysconfdir=/etc install &&
+  default_build &&
 
   # Removing modules we don't support
   rm -rf /usr/lib/dracut/modules.d/{01fips,02fips-aesni,95fcoe,80cms,95dasd,95dasd_mod,95zfcp,95znet} &&
@@ -11,6 +11,9 @@
   # We always install this file (which means overwriting)
   install -m 0644 -g root -o root $SCRIPT_DIRECTORY/files/01-lunar.conf /etc/dracut.conf.d/ &&
 
+  # Install the dracut module to handle lunar cd
+  cp -R $SCRIPT_DIRECTORY/dracut.d/90lunar-live /usr/lib/dracut/modules.d/ &&
+
   gather_docs HACKING TODO AUTHORS
 
 ) > $C_FIFO 2>&1
--- a/kernel/dracut/DEPENDS
+++ b/kernel/dracut/DEPENDS
@@ -19,3 +19,4 @@ optional_depends open-iscsi "" "" "for iSCSI support"
 optional_depends lvm2 "" "" "for Linux Volume Management support"
 optional_depends mdadm "" "" "for software raid support"
 optional_depends rsyslog "" "" "for syslog support"
+optional_depends asciidoc "" "--disable-documentation" "for man pages"
--- a/kernel/dracut/DETAILS
+++ b/kernel/dracut/DETAILS
@@ -1,15 +1,15 @@
            MODULE=dracut
-          VERSION=020
+          VERSION=024
            SOURCE=$MODULE-$VERSION.tar.xz
           SOURCE2=0077-i18n-module-setup.sh-do-not-install-systemd-vconsole.patch
        SOURCE_URL=http://www.kernel.org/pub/linux/utils/boot/dracut
       SOURCE2_URL=$PATCH_URL
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
-       SOURCE_VFY=sha1:6bbfdd36bb65bbb5343baca985a6a2043f8bffdd
+       SOURCE_VFY=sha1:82b195b6028e7d0b84108b1d6b7d7e6bbfb9d1fa
       SOURCE2_VFY=sha1:04a75b432e5efe50f77dc6b2b4f54961cb35640e
          WEB_SITE=https://dracut.wiki.kernel.org/index.php/Main_Page
           ENTERED=20120715
-          UPDATED=20120715
+          UPDATED=20121223
             SHORT="Initramfs generator using udev"
 COMPRESS_MANPAGES=off # If we compress them it will mess up an upgrade for this module due to symlinks
 
--- /dev/null
+++ b/kernel/dracut/dracut.d/90lunar-live/module-setup.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+# -*- mode: shell-scipt; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 filetype=sh
+
+check() {
+  return 255
+}
+
+depends() {
+  return 0
+}
+
+install() {
+  inst_rules 60-cdrom_id.rules
+}
+