git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfg80211: check for and abort dangling scan requests
[pandora-kernel.git]
/
init
/
initramfs.c
diff --git
a/init/initramfs.c
b/init/initramfs.c
index
80cd713
..
4c00edc
100644
(file)
--- a/
init/initramfs.c
+++ b/
init/initramfs.c
@@
-310,7
+310,8
@@
static int __init do_name(void)
if (wfd >= 0) {
sys_fchown(wfd, uid, gid);
sys_fchmod(wfd, mode);
if (wfd >= 0) {
sys_fchown(wfd, uid, gid);
sys_fchmod(wfd, mode);
- sys_ftruncate(wfd, body_len);
+ if (body_len)
+ sys_ftruncate(wfd, body_len);
vcollected = kstrdup(collected, GFP_KERNEL);
state = CopyFile;
}
vcollected = kstrdup(collected, GFP_KERNEL);
state = CopyFile;
}
@@
-515,6
+516,7
@@
skip:
initrd_end = 0;
}
initrd_end = 0;
}
+#ifdef CONFIG_BLK_DEV_RAM
#define BUF_SIZE 1024
static void __init clean_rootfs(void)
{
#define BUF_SIZE 1024
static void __init clean_rootfs(void)
{
@@
-561,6
+563,7
@@
static void __init clean_rootfs(void)
sys_close(fd);
kfree(buf);
}
sys_close(fd);
kfree(buf);
}
+#endif
static int __init populate_rootfs(void)
{
static int __init populate_rootfs(void)
{
@@
-571,11
+574,10
@@
static int __init populate_rootfs(void)
if (initrd_start) {
#ifdef CONFIG_BLK_DEV_RAM
int fd;
if (initrd_start) {
#ifdef CONFIG_BLK_DEV_RAM
int fd;
- printk(KERN_INFO "
checking if image i
s initramfs...\n");
+ printk(KERN_INFO "
Trying to unpack rootfs image a
s initramfs...\n");
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start);
if (!err) {
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start);
if (!err) {
- printk(KERN_INFO "rootfs image is initramfs; unpacking...\n");
free_initrd();
return 0;
} else {
free_initrd();
return 0;
} else {
@@
-593,15
+595,11
@@
static int __init populate_rootfs(void)
free_initrd();
}
#else
free_initrd();
}
#else
- printk(KERN_INFO "Unpacking initramfs...");
+ printk(KERN_INFO "Unpacking initramfs...
\n
");
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start);
err = unpack_to_rootfs((char *)initrd_start,
initrd_end - initrd_start);
- if (err) {
- printk(" failed!\n");
- printk(KERN_EMERG "%s\n", err);
- } else {
- printk(" done\n");
- }
+ if (err)
+ printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
free_initrd();
#endif
}
free_initrd();
#endif
}