diff --git a/kernel/tools/mkinitcpio/comar/pakhandler.py b/kernel/tools/mkinitcpio/comar/pakhandler.py index ff395805..084a2b97 100644 --- a/kernel/tools/mkinitcpio/comar/pakhandler.py +++ b/kernel/tools/mkinitcpio/comar/pakhandler.py @@ -11,7 +11,8 @@ def generateinitrd(filepath): path = item.getTagData("Path") if path.startswith("lib/modules/"): kver = path.split("/")[2] - subprocess.call(["/usr/bin/mkinitcpio","-k","%s"% kver ,"-c","/etc/mkinitcpio.conf","-g","/boot/initramfs-%s"% kver,"-S","autodetect"]) + subprocess.call(["/usr/bin/mkinitcpio","-k","%s"% kver ,"-c","/etc/mkinitcpio.conf","-g","/boot/initramfs-%s-fallback.img"% kver,"-S","autodetect"]) + subprocess.call(["/usr/bin/mkinitcpio","-k","%s"% kver ,"-c","/etc/mkinitcpio.conf","-g","/boot/initramfs-%s.img"% kver]) return def setupPackage(metapath, filepath): diff --git a/kernel/tools/mkinitramfs/comar/package.py b/kernel/tools/mkinitramfs/comar/package.py deleted file mode 100644 index ef6f6400..00000000 --- a/kernel/tools/mkinitramfs/comar/package.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- - -import os - -def preRemove(): - - if os.path.exists("/var/db/comar3/apps/mkinitramfs"): - os.unlink("/var/db/comar3/scripts/System.PackageHandler/mkinitramfs.py") - os.system("/bin/rm -Rf /var/db/comar3/apps/mkinitramfs") - diff --git a/kernel/tools/mkinitramfs/comar/pakhandler.py b/kernel/tools/mkinitramfs/comar/pakhandler.py index 39a202f9..1ac747a7 100644 --- a/kernel/tools/mkinitramfs/comar/pakhandler.py +++ b/kernel/tools/mkinitramfs/comar/pakhandler.py @@ -21,4 +21,4 @@ def cleanupPackage(metapath, filepath): pass def postCleanupPackage(metapath, filepath): - generate_initramfs(filepath) + pass diff --git a/kernel/tools/mkinitramfs/pspec.xml b/kernel/tools/mkinitramfs/pspec.xml index 7d3a9eda..2d91f697 100644 --- a/kernel/tools/mkinitramfs/pspec.xml +++ b/kernel/tools/mkinitramfs/pspec.xml @@ -40,7 +40,6 @@ System.PackageHandler - System.Package